Commit 270faa28 authored by Jonathan Jenkins's avatar Jonathan Jenkins

move non-public io language headers out

parent e98f57ff
...@@ -29,27 +29,21 @@ maintainer-clean-local:: ...@@ -29,27 +29,21 @@ maintainer-clean-local::
src/modelconfig/configparser.h: src/modelconfig/configparser.y src/modelconfig/configparser.h: src/modelconfig/configparser.y
src/modelconfig/configlex.h: src/modelconfig/configlex.l src/modelconfig/configlex.h: src/modelconfig/configlex.l
#BUILT_SOURCES += codes/codesparser.h \ #BUILT_SOURCES += src/iokernellang/codesparser.h \
# src/iokernellang/codesparser.c \ # src/iokernellang/codesparser.c \
# src/iokernellang/codeslexer.h \ # src/iokernellang/codeslexer.h \
# codes/codeslexer.h # src/iokernellang/codeslexer.h
#src/iokernellang/codesparser.y: src/iokernellang/codesparser.y.in Makefile #src/iokernellang/codesparser.y: src/iokernellang/codesparser.y.in Makefile
#src/iokernellang/codesparser.c codes/codesparser.h: src/iokernellang/codesparser.y #src/iokernellang/codesparser.c src/iokernellang/codesparser.h: src/iokernellang/codesparser.y
#codes/codeslexer.h: $(top_srcdir)/src/iokernellang/codeslexer.h #src/iokernellang/codeslexer.h: $(top_srcdir)/src/iokernellang/codeslexer.h
#mkdir -p codes #mkdir -p codes
#cp $(top_srcdir)/src/iokernellang/codeslexer.h codes/codeslexer.h #cp $(top_srcdir)/src/iokernellang/codeslexer.h src/iokernellang/codeslexer.h
nobase_include_HEADERS = \ nobase_include_HEADERS = \
codes/CodesKernelHelpers.h \
codes/CodesIOKernelContext.h \
codes/CodesIOKernelParser.h \
codes/CodesIOKernelTypes.h \
codes/codeslexer.h \
codes/codesparser.h \
codes/quickhash.h \ codes/quickhash.h \
codes/quicklist.h \ codes/quicklist.h \
codes/codes_mapping.h \ codes/codes_mapping.h \
...@@ -68,15 +62,15 @@ nobase_include_HEADERS = \ ...@@ -68,15 +62,15 @@ nobase_include_HEADERS = \
#codes/codes-nw-workload.h #codes/codes-nw-workload.h
src_libcodes_base_a_SOURCES = \ src_libcodes_base_a_SOURCES = \
codes/codesparser.h \ src/iokernellang/codesparser.h \
src/iokernellang/codesparser.c \ src/iokernellang/codesparser.c \
codes/codeslexer.h \ src/iokernellang/codeslexer.h \
src/iokernellang/codeslexer.c \ src/iokernellang/codeslexer.c \
src/iokernellang/codesImpl.c \ src/iokernellang/codesImpl.c \
codes/CodesIOKernelContext.h \ src/iokernellang/CodesIOKernelContext.h \
codes/CodesIOKernelParser.h \ src/iokernellang/CodesIOKernelParser.h \
codes/CodesIOKernelTypes.h \ src/iokernellang/CodesIOKernelTypes.h \
codes/CodesKernelHelpers.h \ src/iokernellang/CodesKernelHelpers.h \
src/iokernellang/CodesKernelHelpers.c \ src/iokernellang/CodesKernelHelpers.c \
src/modelconfig/configlex.c \ src/modelconfig/configlex.c \
src/modelconfig/configlex.h \ src/modelconfig/configlex.h \
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#ifndef CODESIOKERNELPARSER_H #ifndef CODESIOKERNELPARSER_H
#define CODESIOKERNELPARSER_H #define CODESIOKERNELPARSER_H
#include "codes/codesparser.h" #include "codesparser.h"
#include "codes/CodesIOKernelContext.h" #include "CodesIOKernelContext.h"
YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner); YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner);
int CodesIOKernel_lex_init (yyscan_t* scanner); int CodesIOKernel_lex_init (yyscan_t* scanner);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef CODES_H #ifndef CODES_H
#define CODES_H #define CODES_H
#include "codes/CodesIOKernelContext.h" #include "CodesIOKernelContext.h"
typedef enum { typeCon, typeId, typeOpr } nodeEnum; typedef enum { typeCon, typeId, typeOpr } nodeEnum;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
*/ */
#include "codes/CodesKernelHelpers.h" #include "CodesKernelHelpers.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <unistd.h> #include <unistd.h>
#include "codes/CodesIOKernelTypes.h" #include "CodesIOKernelTypes.h"
#include "codes/CodesIOKernelParser.h" #include "CodesIOKernelParser.h"
#include "codes/codeslexer.h" #include "codeslexer.h"
#include "codes/codes-workload.h" #include "codes/codes-workload.h"
#define CL_INST_MAX_ARGS 10 #define CL_INST_MAX_ARGS 10
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "codes/CodesIOKernelTypes.h" #include "CodesIOKernelTypes.h"
#include "codes/CodesIOKernelParser.h" #include "CodesIOKernelParser.h"
int64_t ex( int64_t ex(
nodeType * p) nodeType * p)
......
#line 2 "src/iokernellang/codeslexer.c" #line 2 "codeslexer.c"
#line 4 "src/iokernellang/codeslexer.c" #line 4 "codeslexer.c"
#define YY_INT_ALIGNED short int #define YY_INT_ALIGNED short int
...@@ -538,15 +538,20 @@ static yyconst flex_int32_t yy_rule_can_match_eol[37] = ...@@ -538,15 +538,20 @@ static yyconst flex_int32_t yy_rule_can_match_eol[37] =
#define yymore() yymore_used_but_not_detected #define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0 #define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET #define YY_RESTORE_YY_MORE_OFFSET
#line 1 "src/iokernellang/codeslexer.l" #line 1 "codeslexer.l"
#line 2 "src/iokernellang/codeslexer.l" /*
* Copyright (C) 2013 University of Chicago.
* See COPYRIGHT notice in top-level directory.
*
*/
#line 8 "codeslexer.l"
#include <stdlib.h> #include <stdlib.h>
#include "codes/CodesIOKernelTypes.h" #include "CodesIOKernelTypes.h"
#include "codes/CodesIOKernelParser.h" #include "CodesIOKernelParser.h"
#define YY_NO_INPUT #define YY_NO_INPUT
#line 19 "src/iokernellang/codeslexer.l" #line 25 "codeslexer.l"
YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner); YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner);
int CodesIOKernel_lex_init (yyscan_t* scanner); int CodesIOKernel_lex_init (yyscan_t* scanner);
int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner); int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner);
...@@ -563,7 +568,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[37] = ...@@ -563,7 +568,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[37] =
#define YY_USER_ACTION /* no user action */; #define YY_USER_ACTION /* no user action */;
#endif #endif
#line 567 "src/iokernellang/codeslexer.c" #line 572 "codeslexer.c"
#define INITIAL 0 #define INITIAL 0
...@@ -807,10 +812,10 @@ YY_DECL ...@@ -807,10 +812,10 @@ YY_DECL
register int yy_act; register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
#line 37 "src/iokernellang/codeslexer.l" #line 43 "codeslexer.l"
#line 814 "src/iokernellang/codeslexer.c" #line 819 "codeslexer.c"
yylval = yylval_param; yylval = yylval_param;
...@@ -911,7 +916,7 @@ do_action: /* This label is used only to access EOF actions. */ ...@@ -911,7 +916,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 39 "src/iokernellang/codeslexer.l" #line 45 "codeslexer.l"
{ {
if(yyextra->text != NULL) if(yyextra->text != NULL)
{ {
...@@ -924,7 +929,7 @@ YY_RULE_SETUP ...@@ -924,7 +929,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 2: case 2:
YY_RULE_SETUP YY_RULE_SETUP
#line 49 "src/iokernellang/codeslexer.l" #line 55 "codeslexer.l"
{ {
if(yyextra->text != NULL) if(yyextra->text != NULL)
{ {
...@@ -937,7 +942,7 @@ YY_RULE_SETUP ...@@ -937,7 +942,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 3: case 3:
YY_RULE_SETUP YY_RULE_SETUP
#line 59 "src/iokernellang/codeslexer.l" #line 65 "codeslexer.l"
{ {
if(yyextra->text != NULL) if(yyextra->text != NULL)
{ {
...@@ -950,7 +955,7 @@ YY_RULE_SETUP ...@@ -950,7 +955,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 69 "src/iokernellang/codeslexer.l" #line 75 "codeslexer.l"
{ {
if(yyextra->text != NULL) if(yyextra->text != NULL)
{ {
...@@ -962,166 +967,166 @@ YY_RULE_SETUP ...@@ -962,166 +967,166 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 78 "src/iokernellang/codeslexer.l" #line 84 "codeslexer.l"
return GE; return GE;
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 79 "src/iokernellang/codeslexer.l" #line 85 "codeslexer.l"
return LE; return LE;
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 80 "src/iokernellang/codeslexer.l" #line 86 "codeslexer.l"
return EQ; return EQ;
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 81 "src/iokernellang/codeslexer.l" #line 87 "codeslexer.l"
return NE; return NE;
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 82 "src/iokernellang/codeslexer.l" #line 88 "codeslexer.l"
return WHILE; return WHILE;
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 83 "src/iokernellang/codeslexer.l" #line 89 "codeslexer.l"
return IF; return IF;
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 84 "src/iokernellang/codeslexer.l" #line 90 "codeslexer.l"
return ELSE; return ELSE;
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 85 "src/iokernellang/codeslexer.l" #line 91 "codeslexer.l"
return PRINT; return PRINT;
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 86 "src/iokernellang/codeslexer.l" #line 92 "codeslexer.l"
return WRITE; return WRITE;
YY_BREAK YY_BREAK
case 14: case 14:
YY_RULE_SETUP YY_RULE_SETUP
#line 87 "src/iokernellang/codeslexer.l" #line 93 "codeslexer.l"
return WRITEAT; return WRITEAT;
YY_BREAK YY_BREAK
case 15: case 15:
YY_RULE_SETUP YY_RULE_SETUP
#line 88 "src/iokernellang/codeslexer.l" #line 94 "codeslexer.l"
return WRITE_ALL; return WRITE_ALL;
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "src/iokernellang/codeslexer.l" #line 95 "codeslexer.l"
return WRITEAT_ALL; return WRITEAT_ALL;
YY_BREAK YY_BREAK
case 17: case 17:
YY_RULE_SETUP YY_RULE_SETUP
#line 90 "src/iokernellang/codeslexer.l" #line 96 "codeslexer.l"
return READ; return READ;
YY_BREAK YY_BREAK
case 18: case 18:
YY_RULE_SETUP YY_RULE_SETUP
#line 91 "src/iokernellang/codeslexer.l" #line 97 "codeslexer.l"
return READAT; return READAT;
YY_BREAK YY_BREAK
case 19: case 19:
YY_RULE_SETUP YY_RULE_SETUP
#line 92 "src/iokernellang/codeslexer.l" #line 98 "codeslexer.l"
return READ_ALL; return READ_ALL;
YY_BREAK YY_BREAK
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 93 "src/iokernellang/codeslexer.l" #line 99 "codeslexer.l"
return READAT_ALL; return READAT_ALL;
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 94 "src/iokernellang/codeslexer.l" #line 100 "codeslexer.l"
return SYNC; return SYNC;
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 95 "src/iokernellang/codeslexer.l" #line 101 "codeslexer.l"
return DELETE; return DELETE;
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP
#line 96 "src/iokernellang/codeslexer.l" #line 102 "codeslexer.l"
return SLEEP; return SLEEP;
YY_BREAK YY_BREAK
case 24: case 24:
YY_RULE_SETUP YY_RULE_SETUP
#line 97 "src/iokernellang/codeslexer.l" #line 103 "codeslexer.l"
return OPEN; return OPEN;
YY_BREAK YY_BREAK
case 25: case 25:
YY_RULE_SETUP YY_RULE_SETUP
#line 98 "src/iokernellang/codeslexer.l" #line 104 "codeslexer.l"
return CLOSE; return CLOSE;
YY_BREAK YY_BREAK
case 26: case 26:
YY_RULE_SETUP YY_RULE_SETUP
#line 99 "src/iokernellang/codeslexer.l" #line 105 "codeslexer.l"
return FLUSH; return FLUSH;
YY_BREAK YY_BREAK
case 27: case 27:
YY_RULE_SETUP YY_RULE_SETUP
#line 100 "src/iokernellang/codeslexer.l" #line 106 "codeslexer.l"
return SEEK; return SEEK;
YY_BREAK YY_BREAK
case 28: case 28:
YY_RULE_SETUP YY_RULE_SETUP
#line 101 "src/iokernellang/codeslexer.l" #line 107 "codeslexer.l"
return GETGROUPID; return GETGROUPID;
YY_BREAK YY_BREAK
case 29: case 29:
YY_RULE_SETUP YY_RULE_SETUP
#line 102 "src/iokernellang/codeslexer.l" #line 108 "codeslexer.l"
return GETNUMGROUPS; return GETNUMGROUPS;
YY_BREAK YY_BREAK
case 30: case 30:
YY_RULE_SETUP YY_RULE_SETUP
#line 103 "src/iokernellang/codeslexer.l" #line 109 "codeslexer.l"
return GETGROUPRANK; return GETGROUPRANK;
YY_BREAK YY_BREAK
case 31: case 31:
YY_RULE_SETUP YY_RULE_SETUP
#line 104 "src/iokernellang/codeslexer.l" #line 110 "codeslexer.l"
return GETGROUPSIZE; return GETGROUPSIZE;
YY_BREAK YY_BREAK
case 32: case 32:
YY_RULE_SETUP YY_RULE_SETUP
#line 105 "src/iokernellang/codeslexer.l" #line 111 "codeslexer.l"
return GETCURTIME; return GETCURTIME;
YY_BREAK YY_BREAK
case 33: case 33:
YY_RULE_SETUP YY_RULE_SETUP
#line 106 "src/iokernellang/codeslexer.l" #line 112 "codeslexer.l"
return EXIT; return EXIT;
YY_BREAK YY_BREAK
case 34: case 34:
/* rule 34 can match eol */ /* rule 34 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 108 "src/iokernellang/codeslexer.l" #line 114 "codeslexer.l"
; /* ignore whitespace */ ; /* ignore whitespace */
YY_BREAK YY_BREAK
case 35: case 35:
YY_RULE_SETUP YY_RULE_SETUP
#line 110 "src/iokernellang/codeslexer.l" #line 116 "codeslexer.l"
fprintf(stderr, "Unknown character\n"); fprintf(stderr, "Unknown character\n");
YY_BREAK YY_BREAK
case 36: case 36:
YY_RULE_SETUP YY_RULE_SETUP
#line 111 "src/iokernellang/codeslexer.l" #line 117 "codeslexer.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 1125 "src/iokernellang/codeslexer.c" #line 1130 "codeslexer.c"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
yyterminate(); yyterminate();
...@@ -2269,7 +2274,7 @@ void CodesIOKernel_free (void * ptr , yyscan_t yyscanner) ...@@ -2269,7 +2274,7 @@ void CodesIOKernel_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
#line 111 "src/iokernellang/codeslexer.l" #line 117 "codeslexer.l"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define CodesIOKernel_HEADER_H 1 #define CodesIOKernel_HEADER_H 1
#define CodesIOKernel_IN_HEADER 1 #define CodesIOKernel_IN_HEADER 1
#line 6 "src/iokernellang/codeslexer.h" #line 6 "codeslexer.h"
#line 8 "src/iokernellang/codeslexer.h" #line 8 "codeslexer.h"
#define YY_INT_ALIGNED short int #define YY_INT_ALIGNED short int
...@@ -351,9 +351,9 @@ extern int CodesIOKernel_lex \ ...@@ -351,9 +351,9 @@ extern int CodesIOKernel_lex \
#undef YY_DECL #undef YY_DECL
#endif #endif
#line 111 "src/iokernellang/codeslexer.l" #line 117 "codeslexer.l"
#line 358 "src/iokernellang/codeslexer.h" #line 358 "codeslexer.h"
#undef CodesIOKernel_IN_HEADER #undef CodesIOKernel_IN_HEADER
#endif /* CodesIOKernel_HEADER_H */ #endif /* CodesIOKernel_HEADER_H */
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
%{ %{
#include <stdlib.h> #include <stdlib.h>
#include "codes/CodesIOKernelTypes.h" #include "src/iokernellang/CodesIOKernelTypes.h"
#include "codes/CodesIOKernelParser.h" #include "src/iokernellang/CodesIOKernelParser.h"
#define YY_NO_INPUT #define YY_NO_INPUT
......
This diff is collapsed.
...@@ -115,7 +115,7 @@ typedef union YYSTYPE ...@@ -115,7 +115,7 @@ typedef union YYSTYPE
{ {
/* Line 2068 of yacc.c */ /* Line 2068 of yacc.c */
#line 37 "src/iokernellang/codesparser.y" #line 37 "codesparser.y"
int64_t iValue; /* integer value */ int64_t iValue; /* integer value */
int64_t sIndex; /* symbol table index */ int64_t sIndex; /* symbol table index */
...@@ -124,7 +124,7 @@ typedef union YYSTYPE ...@@ -124,7 +124,7 @@ typedef union YYSTYPE
/* Line 2068 of yacc.c */ /* Line 2068 of yacc.c */
#line 128 "codes/codesparser.h" #line 128 "codesparser.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "codes/CodesIOKernelTypes.h" #include "src/iokernellang/CodesIOKernelTypes.h"
#include "codes/CodesIOKernelContext.h" #include "src/iokernellang/CodesIOKernelContext.h"
/* prototypes */ /* prototypes */
nodeType *opr(int64_t oper, int64_t nops, ...); nodeType *opr(int64_t oper, int64_t nops, ...);
...@@ -62,7 +62,7 @@ int * group_size = NULL; ...@@ -62,7 +62,7 @@ int * group_size = NULL;
%type <nPtr> stmt expr stmt_list %type <nPtr> stmt expr stmt_list
%{ %{
#include "codes/CodesIOKernelContext.h" #include "CodesIOKernelContext.h"
int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner); int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner);
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
* *
*/ */
#include <ross.h> #include <ross.h>
#include <codes/CodesIOKernelTypes.h> #include "src/iokernellang/CodesIOKernelTypes.h"
#include <codes/CodesIOKernelParser.h> #include "src/iokernellang/CodesIOKernelParser.h"
#include <codes/CodesIOKernelContext.h> #include "src/iokernellang/CodesIOKernelContext.h"
#include <codes/codesparser.h> #include "src/iokernellang/codesparser.h"
#include <codes/CodesKernelHelpers.h> #include "src/iokernellang/CodesKernelHelpers.h"
#include <codes/codeslexer.h> #include "src/iokernellang/codeslexer.h"
#include "codes/codes-workload.h" #include "codes/codes-workload.h"
#include "src/workload/codes-workload-method.h" #include "src/workload/codes-workload-method.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment