From 270faa28b2131e59efe996bb30075616bbc2db58 Mon Sep 17 00:00:00 2001 From: John Jenkins Date: Mon, 9 Mar 2015 09:37:30 -0500 Subject: [PATCH] move non-public io language headers out --- src/Makefile.subdir | 28 ++--- .../iokernellang}/CodesIOKernelContext.h | 0 .../iokernellang}/CodesIOKernelParser.h | 4 +- .../iokernellang}/CodesIOKernelTypes.h | 2 +- src/iokernellang/CodesKernelHelpers.c | 2 +- .../iokernellang}/CodesKernelHelpers.h | 6 +- src/iokernellang/codesImpl.c | 4 +- src/iokernellang/codeslexer.c | 101 ++++++++------- {codes => src/iokernellang}/codeslexer.h | 8 +- src/iokernellang/codeslexer.l | 4 +- src/iokernellang/codesparser.c | 118 +++++++++--------- {codes => src/iokernellang}/codesparser.h | 4 +- src/iokernellang/codesparser.y.in | 6 +- src/workload/methods/codes-bgp-io-wrkld.c | 12 +- 14 files changed, 149 insertions(+), 150 deletions(-) rename {codes => src/iokernellang}/CodesIOKernelContext.h (100%) rename {codes => src/iokernellang}/CodesIOKernelParser.h (88%) rename {codes => src/iokernellang}/CodesIOKernelTypes.h (97%) rename {codes => src/iokernellang}/CodesKernelHelpers.h (93%) rename {codes => src/iokernellang}/codeslexer.h (98%) rename {codes => src/iokernellang}/codesparser.h (98%) diff --git a/src/Makefile.subdir b/src/Makefile.subdir index ce47365..e51a501 100644 --- a/src/Makefile.subdir +++ b/src/Makefile.subdir @@ -29,27 +29,21 @@ maintainer-clean-local:: src/modelconfig/configparser.h: src/modelconfig/configparser.y 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/codeslexer.h \ -# codes/codeslexer.h +# src/iokernellang/codeslexer.h #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 -#cp $(top_srcdir)/src/iokernellang/codeslexer.h codes/codeslexer.h +#cp $(top_srcdir)/src/iokernellang/codeslexer.h src/iokernellang/codeslexer.h 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/quicklist.h \ codes/codes_mapping.h \ @@ -68,15 +62,15 @@ nobase_include_HEADERS = \ #codes/codes-nw-workload.h src_libcodes_base_a_SOURCES = \ - codes/codesparser.h \ + src/iokernellang/codesparser.h \ src/iokernellang/codesparser.c \ - codes/codeslexer.h \ + src/iokernellang/codeslexer.h \ src/iokernellang/codeslexer.c \ src/iokernellang/codesImpl.c \ - codes/CodesIOKernelContext.h \ - codes/CodesIOKernelParser.h \ - codes/CodesIOKernelTypes.h \ - codes/CodesKernelHelpers.h \ + src/iokernellang/CodesIOKernelContext.h \ + src/iokernellang/CodesIOKernelParser.h \ + src/iokernellang/CodesIOKernelTypes.h \ + src/iokernellang/CodesKernelHelpers.h \ src/iokernellang/CodesKernelHelpers.c \ src/modelconfig/configlex.c \ src/modelconfig/configlex.h \ diff --git a/codes/CodesIOKernelContext.h b/src/iokernellang/CodesIOKernelContext.h similarity index 100% rename from codes/CodesIOKernelContext.h rename to src/iokernellang/CodesIOKernelContext.h diff --git a/codes/CodesIOKernelParser.h b/src/iokernellang/CodesIOKernelParser.h similarity index 88% rename from codes/CodesIOKernelParser.h rename to src/iokernellang/CodesIOKernelParser.h index 3c4f6b8..befb56d 100644 --- a/codes/CodesIOKernelParser.h +++ b/src/iokernellang/CodesIOKernelParser.h @@ -7,8 +7,8 @@ #ifndef CODESIOKERNELPARSER_H #define CODESIOKERNELPARSER_H -#include "codes/codesparser.h" -#include "codes/CodesIOKernelContext.h" +#include "codesparser.h" +#include "CodesIOKernelContext.h" YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner); int CodesIOKernel_lex_init (yyscan_t* scanner); diff --git a/codes/CodesIOKernelTypes.h b/src/iokernellang/CodesIOKernelTypes.h similarity index 97% rename from codes/CodesIOKernelTypes.h rename to src/iokernellang/CodesIOKernelTypes.h index 0f46de0..f797e08 100644 --- a/codes/CodesIOKernelTypes.h +++ b/src/iokernellang/CodesIOKernelTypes.h @@ -7,7 +7,7 @@ #ifndef CODES_H #define CODES_H -#include "codes/CodesIOKernelContext.h" +#include "CodesIOKernelContext.h" typedef enum { typeCon, typeId, typeOpr } nodeEnum; diff --git a/src/iokernellang/CodesKernelHelpers.c b/src/iokernellang/CodesKernelHelpers.c index d790755..df6d3d9 100644 --- a/src/iokernellang/CodesKernelHelpers.c +++ b/src/iokernellang/CodesKernelHelpers.c @@ -4,7 +4,7 @@ * */ -#include "codes/CodesKernelHelpers.h" +#include "CodesKernelHelpers.h" #include #include diff --git a/codes/CodesKernelHelpers.h b/src/iokernellang/CodesKernelHelpers.h similarity index 93% rename from codes/CodesKernelHelpers.h rename to src/iokernellang/CodesKernelHelpers.h index 001303f..e103ac8 100644 --- a/codes/CodesKernelHelpers.h +++ b/src/iokernellang/CodesKernelHelpers.h @@ -17,9 +17,9 @@ #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelParser.h" -#include "codes/codeslexer.h" +#include "CodesIOKernelTypes.h" +#include "CodesIOKernelParser.h" +#include "codeslexer.h" #include "codes/codes-workload.h" #define CL_INST_MAX_ARGS 10 diff --git a/src/iokernellang/codesImpl.c b/src/iokernellang/codesImpl.c index 522768e..bd8c599 100644 --- a/src/iokernellang/codesImpl.c +++ b/src/iokernellang/codesImpl.c @@ -7,8 +7,8 @@ #include #include #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelParser.h" +#include "CodesIOKernelTypes.h" +#include "CodesIOKernelParser.h" int64_t ex( nodeType * p) diff --git a/src/iokernellang/codeslexer.c b/src/iokernellang/codeslexer.c index 0de434f..3b27427 100644 --- a/src/iokernellang/codeslexer.c +++ b/src/iokernellang/codeslexer.c @@ -1,6 +1,6 @@ -#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 @@ -538,15 +538,20 @@ static yyconst flex_int32_t yy_rule_can_match_eol[37] = #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -#line 1 "src/iokernellang/codeslexer.l" -#line 2 "src/iokernellang/codeslexer.l" +#line 1 "codeslexer.l" +/* + * Copyright (C) 2013 University of Chicago. + * See COPYRIGHT notice in top-level directory. + * + */ +#line 8 "codeslexer.l" #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelParser.h" +#include "CodesIOKernelTypes.h" +#include "CodesIOKernelParser.h" #define YY_NO_INPUT -#line 19 "src/iokernellang/codeslexer.l" +#line 25 "codeslexer.l" YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner); int CodesIOKernel_lex_init (yyscan_t* 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] = #define YY_USER_ACTION /* no user action */; #endif -#line 567 "src/iokernellang/codeslexer.c" +#line 572 "codeslexer.c" #define INITIAL 0 @@ -807,10 +812,10 @@ YY_DECL register int yy_act; 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; @@ -911,7 +916,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 39 "src/iokernellang/codeslexer.l" +#line 45 "codeslexer.l" { if(yyextra->text != NULL) { @@ -924,7 +929,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 49 "src/iokernellang/codeslexer.l" +#line 55 "codeslexer.l" { if(yyextra->text != NULL) { @@ -937,7 +942,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 59 "src/iokernellang/codeslexer.l" +#line 65 "codeslexer.l" { if(yyextra->text != NULL) { @@ -950,7 +955,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 69 "src/iokernellang/codeslexer.l" +#line 75 "codeslexer.l" { if(yyextra->text != NULL) { @@ -962,166 +967,166 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 78 "src/iokernellang/codeslexer.l" +#line 84 "codeslexer.l" return GE; YY_BREAK case 6: YY_RULE_SETUP -#line 79 "src/iokernellang/codeslexer.l" +#line 85 "codeslexer.l" return LE; YY_BREAK case 7: YY_RULE_SETUP -#line 80 "src/iokernellang/codeslexer.l" +#line 86 "codeslexer.l" return EQ; YY_BREAK case 8: YY_RULE_SETUP -#line 81 "src/iokernellang/codeslexer.l" +#line 87 "codeslexer.l" return NE; YY_BREAK case 9: YY_RULE_SETUP -#line 82 "src/iokernellang/codeslexer.l" +#line 88 "codeslexer.l" return WHILE; YY_BREAK case 10: YY_RULE_SETUP -#line 83 "src/iokernellang/codeslexer.l" +#line 89 "codeslexer.l" return IF; YY_BREAK case 11: YY_RULE_SETUP -#line 84 "src/iokernellang/codeslexer.l" +#line 90 "codeslexer.l" return ELSE; YY_BREAK case 12: YY_RULE_SETUP -#line 85 "src/iokernellang/codeslexer.l" +#line 91 "codeslexer.l" return PRINT; YY_BREAK case 13: YY_RULE_SETUP -#line 86 "src/iokernellang/codeslexer.l" +#line 92 "codeslexer.l" return WRITE; YY_BREAK case 14: YY_RULE_SETUP -#line 87 "src/iokernellang/codeslexer.l" +#line 93 "codeslexer.l" return WRITEAT; YY_BREAK case 15: YY_RULE_SETUP -#line 88 "src/iokernellang/codeslexer.l" +#line 94 "codeslexer.l" return WRITE_ALL; YY_BREAK case 16: YY_RULE_SETUP -#line 89 "src/iokernellang/codeslexer.l" +#line 95 "codeslexer.l" return WRITEAT_ALL; YY_BREAK case 17: YY_RULE_SETUP -#line 90 "src/iokernellang/codeslexer.l" +#line 96 "codeslexer.l" return READ; YY_BREAK case 18: YY_RULE_SETUP -#line 91 "src/iokernellang/codeslexer.l" +#line 97 "codeslexer.l" return READAT; YY_BREAK case 19: YY_RULE_SETUP -#line 92 "src/iokernellang/codeslexer.l" +#line 98 "codeslexer.l" return READ_ALL; YY_BREAK case 20: YY_RULE_SETUP -#line 93 "src/iokernellang/codeslexer.l" +#line 99 "codeslexer.l" return READAT_ALL; YY_BREAK case 21: YY_RULE_SETUP -#line 94 "src/iokernellang/codeslexer.l" +#line 100 "codeslexer.l" return SYNC; YY_BREAK case 22: YY_RULE_SETUP -#line 95 "src/iokernellang/codeslexer.l" +#line 101 "codeslexer.l" return DELETE; YY_BREAK case 23: YY_RULE_SETUP -#line 96 "src/iokernellang/codeslexer.l" +#line 102 "codeslexer.l" return SLEEP; YY_BREAK case 24: YY_RULE_SETUP -#line 97 "src/iokernellang/codeslexer.l" +#line 103 "codeslexer.l" return OPEN; YY_BREAK case 25: YY_RULE_SETUP -#line 98 "src/iokernellang/codeslexer.l" +#line 104 "codeslexer.l" return CLOSE; YY_BREAK case 26: YY_RULE_SETUP -#line 99 "src/iokernellang/codeslexer.l" +#line 105 "codeslexer.l" return FLUSH; YY_BREAK case 27: YY_RULE_SETUP -#line 100 "src/iokernellang/codeslexer.l" +#line 106 "codeslexer.l" return SEEK; YY_BREAK case 28: YY_RULE_SETUP -#line 101 "src/iokernellang/codeslexer.l" +#line 107 "codeslexer.l" return GETGROUPID; YY_BREAK case 29: YY_RULE_SETUP -#line 102 "src/iokernellang/codeslexer.l" +#line 108 "codeslexer.l" return GETNUMGROUPS; YY_BREAK case 30: YY_RULE_SETUP -#line 103 "src/iokernellang/codeslexer.l" +#line 109 "codeslexer.l" return GETGROUPRANK; YY_BREAK case 31: YY_RULE_SETUP -#line 104 "src/iokernellang/codeslexer.l" +#line 110 "codeslexer.l" return GETGROUPSIZE; YY_BREAK case 32: YY_RULE_SETUP -#line 105 "src/iokernellang/codeslexer.l" +#line 111 "codeslexer.l" return GETCURTIME; YY_BREAK case 33: YY_RULE_SETUP -#line 106 "src/iokernellang/codeslexer.l" +#line 112 "codeslexer.l" return EXIT; YY_BREAK case 34: /* rule 34 can match eol */ YY_RULE_SETUP -#line 108 "src/iokernellang/codeslexer.l" +#line 114 "codeslexer.l" ; /* ignore whitespace */ YY_BREAK case 35: YY_RULE_SETUP -#line 110 "src/iokernellang/codeslexer.l" +#line 116 "codeslexer.l" fprintf(stderr, "Unknown character\n"); YY_BREAK case 36: YY_RULE_SETUP -#line 111 "src/iokernellang/codeslexer.l" +#line 117 "codeslexer.l" ECHO; YY_BREAK -#line 1125 "src/iokernellang/codeslexer.c" +#line 1130 "codeslexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2269,7 +2274,7 @@ void CodesIOKernel_free (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 111 "src/iokernellang/codeslexer.l" +#line 117 "codeslexer.l" diff --git a/codes/codeslexer.h b/src/iokernellang/codeslexer.h similarity index 98% rename from codes/codeslexer.h rename to src/iokernellang/codeslexer.h index e2c19e5..b571954 100644 --- a/codes/codeslexer.h +++ b/src/iokernellang/codeslexer.h @@ -2,9 +2,9 @@ #define CodesIOKernel_HEADER_H 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 @@ -351,9 +351,9 @@ extern int CodesIOKernel_lex \ #undef YY_DECL #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 #endif /* CodesIOKernel_HEADER_H */ diff --git a/src/iokernellang/codeslexer.l b/src/iokernellang/codeslexer.l index 772d8bb..ba0e41a 100644 --- a/src/iokernellang/codeslexer.l +++ b/src/iokernellang/codeslexer.l @@ -6,8 +6,8 @@ %{ #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelParser.h" +#include "src/iokernellang/CodesIOKernelTypes.h" +#include "src/iokernellang/CodesIOKernelParser.h" #define YY_NO_INPUT diff --git a/src/iokernellang/codesparser.c b/src/iokernellang/codesparser.c index a5f2075..88b5f2f 100644 --- a/src/iokernellang/codesparser.c +++ b/src/iokernellang/codesparser.c @@ -77,15 +77,15 @@ /* Copy the first part of user declarations. */ /* Line 268 of yacc.c */ -#line 1 "src/iokernellang/codesparser.y" +#line 1 "codesparser.y" #include #include #include #include #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelContext.h" +#include "CodesIOKernelTypes.h" +#include "CodesIOKernelContext.h" /* prototypes */ nodeType *opr(int64_t oper, int64_t nops, ...); @@ -102,7 +102,7 @@ int * group_size = NULL; /* Line 268 of yacc.c */ -#line 106 "src/iokernellang/codesparser.c" +#line 106 "codesparser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -207,7 +207,7 @@ typedef union YYSTYPE { /* Line 293 of yacc.c */ -#line 37 "src/iokernellang/codesparser.y" +#line 37 "codesparser.y" int64_t iValue; /* integer value */ int64_t sIndex; /* symbol table index */ @@ -216,7 +216,7 @@ typedef union YYSTYPE /* Line 293 of yacc.c */ -#line 220 "src/iokernellang/codesparser.c" +#line 220 "codesparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -264,9 +264,9 @@ void yypstate_delete (); /* Copy the second part of user declarations. */ /* Line 343 of yacc.c */ -#line 58 "src/iokernellang/codesparser.y" +#line 58 "codesparser.y" - #include "codes/CodesIOKernelContext.h" + #include "CodesIOKernelContext.h" int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner); @@ -279,7 +279,7 @@ void yypstate_delete (); /* Line 343 of yacc.c */ -#line 283 "src/iokernellang/codesparser.c" +#line 283 "codesparser.c" #ifdef short # undef short @@ -1833,343 +1833,343 @@ yyreduce: case 2: /* Line 1806 of yacc.c */ -#line 74 "src/iokernellang/codesparser.y" +#line 74 "codesparser.y" { /*exit(0)*/; } break; case 3: /* Line 1806 of yacc.c */ -#line 78 "src/iokernellang/codesparser.y" +#line 78 "codesparser.y" { ex((yyvsp[(2) - (2)].nPtr)); freeNode((yyvsp[(2) - (2)].nPtr)); } break; case 5: /* Line 1806 of yacc.c */ -#line 83 "src/iokernellang/codesparser.y" +#line 83 "codesparser.y" { (yyval.nPtr) = opr(';', 2, NULL, NULL); } break; case 6: /* Line 1806 of yacc.c */ -#line 84 "src/iokernellang/codesparser.y" +#line 84 "codesparser.y" { (yyval.nPtr) = (yyvsp[(1) - (2)].nPtr); } break; case 7: /* Line 1806 of yacc.c */ -#line 85 "src/iokernellang/codesparser.y" +#line 85 "codesparser.y" { (yyval.nPtr) = opr(EXIT, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 8: /* Line 1806 of yacc.c */ -#line 86 "src/iokernellang/codesparser.y" +#line 86 "codesparser.y" { (yyval.nPtr) = opr(PRINT, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 9: /* Line 1806 of yacc.c */ -#line 87 "src/iokernellang/codesparser.y" +#line 87 "codesparser.y" { (yyval.nPtr) = opr(WRITE, 2, (yyvsp[(2) - (5)].nPtr), (yyvsp[(4) - (5)].nPtr)); } break; case 10: /* Line 1806 of yacc.c */ -#line 88 "src/iokernellang/codesparser.y" +#line 88 "codesparser.y" { (yyval.nPtr) = opr(WRITE_ALL, 2, (yyvsp[(2) - (5)].nPtr), (yyvsp[(4) - (5)].nPtr)); } break; case 11: /* Line 1806 of yacc.c */ -#line 89 "src/iokernellang/codesparser.y" +#line 89 "codesparser.y" { (yyval.nPtr) = opr(WRITEAT, 3, (yyvsp[(2) - (7)].nPtr), (yyvsp[(4) - (7)].nPtr), (yyvsp[(6) - (7)].nPtr)); } break; case 12: /* Line 1806 of yacc.c */ -#line 90 "src/iokernellang/codesparser.y" +#line 90 "codesparser.y" { (yyval.nPtr) = opr(WRITEAT_ALL, 3, (yyvsp[(2) - (7)].nPtr), (yyvsp[(4) - (7)].nPtr), (yyvsp[(6) - (7)].nPtr)); } break; case 13: /* Line 1806 of yacc.c */ -#line 91 "src/iokernellang/codesparser.y" +#line 91 "codesparser.y" { (yyval.nPtr) = opr(READ, 2, (yyvsp[(2) - (5)].nPtr), (yyvsp[(4) - (5)].nPtr)); } break; case 14: /* Line 1806 of yacc.c */ -#line 92 "src/iokernellang/codesparser.y" +#line 92 "codesparser.y" { (yyval.nPtr) = opr(READ_ALL, 2, (yyvsp[(2) - (5)].nPtr), (yyvsp[(4) - (5)].nPtr)); } break; case 15: /* Line 1806 of yacc.c */ -#line 93 "src/iokernellang/codesparser.y" +#line 93 "codesparser.y" { (yyval.nPtr) = opr(READAT, 3, (yyvsp[(2) - (7)].nPtr), (yyvsp[(4) - (7)].nPtr), (yyvsp[(6) - (7)].nPtr) ); } break; case 16: /* Line 1806 of yacc.c */ -#line 94 "src/iokernellang/codesparser.y" +#line 94 "codesparser.y" { (yyval.nPtr) = opr(READAT_ALL, 3, (yyvsp[(2) - (7)].nPtr), (yyvsp[(4) - (7)].nPtr), (yyvsp[(6) - (7)].nPtr) ); } break; case 17: /* Line 1806 of yacc.c */ -#line 95 "src/iokernellang/codesparser.y" +#line 95 "codesparser.y" { (yyval.nPtr) = opr(SYNC, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 18: /* Line 1806 of yacc.c */ -#line 96 "src/iokernellang/codesparser.y" +#line 96 "codesparser.y" { (yyval.nPtr) = opr(SLEEP, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 19: /* Line 1806 of yacc.c */ -#line 97 "src/iokernellang/codesparser.y" +#line 97 "codesparser.y" { (yyval.nPtr) = opr(OPEN, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 20: /* Line 1806 of yacc.c */ -#line 98 "src/iokernellang/codesparser.y" +#line 98 "codesparser.y" { (yyval.nPtr) = opr(CLOSE, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 21: /* Line 1806 of yacc.c */ -#line 99 "src/iokernellang/codesparser.y" +#line 99 "codesparser.y" { (yyval.nPtr) = opr(DELETE, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 22: /* Line 1806 of yacc.c */ -#line 100 "src/iokernellang/codesparser.y" +#line 100 "codesparser.y" { (yyval.nPtr) = opr(FLUSH, 1, (yyvsp[(2) - (3)].nPtr)); } break; case 23: /* Line 1806 of yacc.c */ -#line 101 "src/iokernellang/codesparser.y" +#line 101 "codesparser.y" { (yyval.nPtr) = opr(SEEK, 2, (yyvsp[(2) - (5)].nPtr), (yyvsp[(4) - (5)].nPtr)); } break; case 24: /* Line 1806 of yacc.c */ -#line 102 "src/iokernellang/codesparser.y" +#line 102 "codesparser.y" { (yyval.nPtr) = opr('=', 2, id((yyvsp[(1) - (4)].sIndex)), (yyvsp[(3) - (4)].nPtr)); } break; case 25: /* Line 1806 of yacc.c */ -#line 103 "src/iokernellang/codesparser.y" +#line 103 "codesparser.y" { (yyval.nPtr) = opr(WHILE, 2, (yyvsp[(3) - (5)].nPtr), (yyvsp[(5) - (5)].nPtr)); } break; case 26: /* Line 1806 of yacc.c */ -#line 104 "src/iokernellang/codesparser.y" +#line 104 "codesparser.y" { (yyval.nPtr) = opr(IF, 2, (yyvsp[(3) - (5)].nPtr), (yyvsp[(5) - (5)].nPtr)); } break; case 27: /* Line 1806 of yacc.c */ -#line 105 "src/iokernellang/codesparser.y" +#line 105 "codesparser.y" { (yyval.nPtr) = opr(IF, 3, (yyvsp[(3) - (7)].nPtr), (yyvsp[(5) - (7)].nPtr), (yyvsp[(7) - (7)].nPtr)); } break; case 28: /* Line 1806 of yacc.c */ -#line 106 "src/iokernellang/codesparser.y" +#line 106 "codesparser.y" { (yyval.nPtr) = (yyvsp[(2) - (3)].nPtr); } break; case 29: /* Line 1806 of yacc.c */ -#line 110 "src/iokernellang/codesparser.y" +#line 110 "codesparser.y" { (yyval.nPtr) = (yyvsp[(1) - (1)].nPtr); } break; case 30: /* Line 1806 of yacc.c */ -#line 111 "src/iokernellang/codesparser.y" +#line 111 "codesparser.y" { (yyval.nPtr) = opr(';', 2, (yyvsp[(1) - (2)].nPtr), (yyvsp[(2) - (2)].nPtr)); } break; case 31: /* Line 1806 of yacc.c */ -#line 115 "src/iokernellang/codesparser.y" +#line 115 "codesparser.y" { (yyval.nPtr) = con((yyvsp[(1) - (1)].iValue)); } break; case 32: /* Line 1806 of yacc.c */ -#line 116 "src/iokernellang/codesparser.y" +#line 116 "codesparser.y" { (yyval.nPtr) = id((yyvsp[(1) - (1)].sIndex)); } break; case 33: /* Line 1806 of yacc.c */ -#line 117 "src/iokernellang/codesparser.y" +#line 117 "codesparser.y" { (yyval.nPtr) = opr(UMINUS, 1, (yyvsp[(2) - (2)].nPtr)); } break; case 34: /* Line 1806 of yacc.c */ -#line 118 "src/iokernellang/codesparser.y" +#line 118 "codesparser.y" { (yyval.nPtr) = opr('+', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 35: /* Line 1806 of yacc.c */ -#line 119 "src/iokernellang/codesparser.y" +#line 119 "codesparser.y" { (yyval.nPtr) = opr('-', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 36: /* Line 1806 of yacc.c */ -#line 120 "src/iokernellang/codesparser.y" +#line 120 "codesparser.y" { (yyval.nPtr) = opr('*', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 37: /* Line 1806 of yacc.c */ -#line 121 "src/iokernellang/codesparser.y" +#line 121 "codesparser.y" { (yyval.nPtr) = opr('/', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 38: /* Line 1806 of yacc.c */ -#line 122 "src/iokernellang/codesparser.y" +#line 122 "codesparser.y" { (yyval.nPtr) = opr('%', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 39: /* Line 1806 of yacc.c */ -#line 123 "src/iokernellang/codesparser.y" +#line 123 "codesparser.y" { (yyval.nPtr) = opr('<', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 40: /* Line 1806 of yacc.c */ -#line 124 "src/iokernellang/codesparser.y" +#line 124 "codesparser.y" { (yyval.nPtr) = opr('>', 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 41: /* Line 1806 of yacc.c */ -#line 125 "src/iokernellang/codesparser.y" +#line 125 "codesparser.y" { (yyval.nPtr) = opr(GE, 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 42: /* Line 1806 of yacc.c */ -#line 126 "src/iokernellang/codesparser.y" +#line 126 "codesparser.y" { (yyval.nPtr) = opr(LE, 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 43: /* Line 1806 of yacc.c */ -#line 127 "src/iokernellang/codesparser.y" +#line 127 "codesparser.y" { (yyval.nPtr) = opr(NE, 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 44: /* Line 1806 of yacc.c */ -#line 128 "src/iokernellang/codesparser.y" +#line 128 "codesparser.y" { (yyval.nPtr) = opr(EQ, 2, (yyvsp[(1) - (3)].nPtr), (yyvsp[(3) - (3)].nPtr)); } break; case 45: /* Line 1806 of yacc.c */ -#line 129 "src/iokernellang/codesparser.y" +#line 129 "codesparser.y" { (yyval.nPtr) = opr(GETGROUPRANK, 1, (yyvsp[(2) - (2)].nPtr)); } break; case 46: /* Line 1806 of yacc.c */ -#line 130 "src/iokernellang/codesparser.y" +#line 130 "codesparser.y" { (yyval.nPtr) = opr(GETGROUPSIZE, 1, (yyvsp[(2) - (2)].nPtr)); } break; case 47: /* Line 1806 of yacc.c */ -#line 131 "src/iokernellang/codesparser.y" +#line 131 "codesparser.y" { (yyval.nPtr) = opr(GETCURTIME, 0); } break; case 48: /* Line 1806 of yacc.c */ -#line 132 "src/iokernellang/codesparser.y" +#line 132 "codesparser.y" { (yyval.nPtr) = opr(GETGROUPID, 0); } break; case 49: /* Line 1806 of yacc.c */ -#line 133 "src/iokernellang/codesparser.y" +#line 133 "codesparser.y" { (yyval.nPtr) = opr(GETNUMGROUPS, 0); } break; case 50: /* Line 1806 of yacc.c */ -#line 134 "src/iokernellang/codesparser.y" +#line 134 "codesparser.y" { (yyval.nPtr) = (yyvsp[(2) - (3)].nPtr); } break; /* Line 1806 of yacc.c */ -#line 2173 "src/iokernellang/codesparser.c" +#line 2173 "codesparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2410,7 +2410,7 @@ yypushreturn: /* Line 2067 of yacc.c */ -#line 137 "src/iokernellang/codesparser.y" +#line 137 "codesparser.y" #define SIZEOF_NODETYPE ((char *)&p->con - (char *)p) diff --git a/codes/codesparser.h b/src/iokernellang/codesparser.h similarity index 98% rename from codes/codesparser.h rename to src/iokernellang/codesparser.h index b1ef810..f11eb34 100644 --- a/codes/codesparser.h +++ b/src/iokernellang/codesparser.h @@ -115,7 +115,7 @@ typedef union YYSTYPE { /* Line 2068 of yacc.c */ -#line 37 "src/iokernellang/codesparser.y" +#line 37 "codesparser.y" int64_t iValue; /* integer value */ int64_t sIndex; /* symbol table index */ @@ -124,7 +124,7 @@ typedef union YYSTYPE /* Line 2068 of yacc.c */ -#line 128 "codes/codesparser.h" +#line 128 "codesparser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/iokernellang/codesparser.y.in b/src/iokernellang/codesparser.y.in index 02be2ca..5d33d3a 100644 --- a/src/iokernellang/codesparser.y.in +++ b/src/iokernellang/codesparser.y.in @@ -10,8 +10,8 @@ #include #include #include -#include "codes/CodesIOKernelTypes.h" -#include "codes/CodesIOKernelContext.h" +#include "src/iokernellang/CodesIOKernelTypes.h" +#include "src/iokernellang/CodesIOKernelContext.h" /* prototypes */ nodeType *opr(int64_t oper, int64_t nops, ...); @@ -62,7 +62,7 @@ int * group_size = NULL; %type stmt expr stmt_list %{ - #include "codes/CodesIOKernelContext.h" + #include "CodesIOKernelContext.h" int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner); diff --git a/src/workload/methods/codes-bgp-io-wrkld.c b/src/workload/methods/codes-bgp-io-wrkld.c index ec612a7..cdfe6a7 100644 --- a/src/workload/methods/codes-bgp-io-wrkld.c +++ b/src/workload/methods/codes-bgp-io-wrkld.c @@ -4,12 +4,12 @@ * */ #include -#include -#include -#include -#include -#include -#include +#include "src/iokernellang/CodesIOKernelTypes.h" +#include "src/iokernellang/CodesIOKernelParser.h" +#include "src/iokernellang/CodesIOKernelContext.h" +#include "src/iokernellang/codesparser.h" +#include "src/iokernellang/CodesKernelHelpers.h" +#include "src/iokernellang/codeslexer.h" #include "codes/codes-workload.h" #include "src/workload/codes-workload-method.h" -- 2.26.2