From 49b5163cc9764f32bd9ab2a2135247f83dfdcbfb Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 1 Apr 2016 15:17:48 -0400 Subject: [PATCH] Regenerated parsers and scanners. --- Sources/Ecc/Parser.cpp | 372 ++++++++++++++++---------------- Sources/Ecc/Scanner.cpp | 186 ++++++++-------- Sources/Engine/Base/Parser.cpp | 160 +++++++------- Sources/Engine/Base/Scanner.cpp | 120 +++++------ Sources/Engine/Base/parser.h | 4 +- 5 files changed, 421 insertions(+), 421 deletions(-) diff --git a/Sources/Ecc/Parser.cpp b/Sources/Ecc/Parser.cpp index c8935d7..7cdc87f 100644 --- a/Sources/Ecc/Parser.cpp +++ b/Sources/Ecc/Parser.cpp @@ -216,7 +216,7 @@ /* Copy the first part of user declarations. */ -#line 1 "./Ecc/Parser.y" +#line 1 "Ecc/Parser.y" // rcg10042001 Changed to specify Ecc directory... #include "Ecc/StdH.h" @@ -403,7 +403,7 @@ typedef int YYSTYPE; /* Line 216 of yacc.c. */ -#line 407 "./Ecc/Parser.cpp" +#line 407 "Ecc/Parser.cpp" #ifdef short # undef short @@ -2687,7 +2687,7 @@ yyreduce: switch (yyn) { case 2: -#line 253 "./Ecc/Parser.y" +#line 253 "Ecc/Parser.y" { int iID = atoi((yyvsp[(1) - (1)]).strString); if(iID>32767) { @@ -2702,7 +2702,7 @@ yyreduce: break; case 3: -#line 263 "./Ecc/Parser.y" +#line 263 "Ecc/Parser.y" { //fprintf(_fImplementation, "\n#undef DECL_DLL\n#define DECL_DLL _declspec(dllimport)\n"); @@ -2710,7 +2710,7 @@ yyreduce: break; case 4: -#line 266 "./Ecc/Parser.y" +#line 266 "Ecc/Parser.y" { //fprintf(_fImplementation, "\n#undef DECL_DLL\n#define DECL_DLL _declspec(dllexport)\n"); @@ -2720,31 +2720,31 @@ yyreduce: break; case 5: -#line 271 "./Ecc/Parser.y" +#line 271 "Ecc/Parser.y" { ;} break; case 6: -#line 272 "./Ecc/Parser.y" +#line 272 "Ecc/Parser.y" { ;} break; case 7: -#line 273 "./Ecc/Parser.y" +#line 273 "Ecc/Parser.y" { fprintf(_fDeclaration, "#endif // _%s_INCLUDED\n", _strFileNameBaseIdentifier); ;} break; case 9: -#line 284 "./Ecc/Parser.y" +#line 284 "Ecc/Parser.y" { fprintf(_fImplementation, "%s\n", (yyvsp[(1) - (1)]).strString); ;} break; case 12: -#line 292 "./Ecc/Parser.y" +#line 292 "Ecc/Parser.y" { char *strUsedFileName = strdup((yyvsp[(2) - (3)]).strString); strUsedFileName[strlen(strUsedFileName)-1] = 0; @@ -2753,7 +2753,7 @@ yyreduce: break; case 16: -#line 309 "./Ecc/Parser.y" +#line 309 "Ecc/Parser.y" { _strCurrentEnum = (yyvsp[(2) - (2)]).strString; fprintf(_fTables, "EP_ENUMBEG(%s)\n", _strCurrentEnum ); @@ -2763,7 +2763,7 @@ yyreduce: break; case 17: -#line 314 "./Ecc/Parser.y" +#line 314 "Ecc/Parser.y" { fprintf(_fTables, "EP_ENUMEND(%s);\n\n", _strCurrentEnum); fprintf(_fDeclaration, "};\n"); @@ -2772,7 +2772,7 @@ yyreduce: break; case 22: -#line 327 "./Ecc/Parser.y" +#line 327 "Ecc/Parser.y" { fprintf(_fTables, " EP_ENUMVALUE(%s, %s),\n", (yyvsp[(2) - (3)]).strString, (yyvsp[(3) - (3)]).strString); fprintf(_fDeclaration, " %s = %s,\n", (yyvsp[(2) - (3)]).strString, (yyvsp[(1) - (3)]).strString); @@ -2780,7 +2780,7 @@ yyreduce: break; case 23: -#line 337 "./Ecc/Parser.y" +#line 337 "Ecc/Parser.y" { _strCurrentEvent = (yyvsp[(2) - (2)]).strString; int iID = CreateID(); @@ -2800,7 +2800,7 @@ yyreduce: break; case 24: -#line 352 "./Ecc/Parser.y" +#line 352 "Ecc/Parser.y" { fprintf(_fImplementation, "};\n"); fprintf(_fDeclaration, "};\n"); @@ -2809,7 +2809,7 @@ yyreduce: break; case 29: -#line 370 "./Ecc/Parser.y" +#line 370 "Ecc/Parser.y" { fprintf(_fDeclaration, "%s %s;\n", (yyvsp[(1) - (2)]).strString, (yyvsp[(2) - (2)]).strString); fprintf(_fImplementation, " ClearToDefault(%s);\n", (yyvsp[(2) - (2)]).strString); @@ -2817,7 +2817,7 @@ yyreduce: break; case 33: -#line 388 "./Ecc/Parser.y" +#line 388 "Ecc/Parser.y" { _strCurrentClass = (yyvsp[(2) - (11)]).strString; _strCurrentBase = (yyvsp[(4) - (11)]).strString; @@ -2834,7 +2834,7 @@ yyreduce: break; case 34: -#line 400 "./Ecc/Parser.y" +#line 400 "Ecc/Parser.y" { fprintf(_fDeclaration, " %s virtual void SetDefaultProperties(void);\n", _bClassIsExported?"":"DECL_DLL"); fprintf(_fImplementation, "void %s::SetDefaultProperties(void) {\n", _strCurrentClass); @@ -2844,7 +2844,7 @@ yyreduce: break; case 35: -#line 405 "./Ecc/Parser.y" +#line 405 "Ecc/Parser.y" { fprintf(_fImplementation, " %s::SetDefaultProperties();\n}\n", _strCurrentBase); @@ -2853,13 +2853,13 @@ yyreduce: break; case 36: -#line 409 "./Ecc/Parser.y" +#line 409 "Ecc/Parser.y" { ;} break; case 37: -#line 410 "./Ecc/Parser.y" +#line 410 "Ecc/Parser.y" { _bTrackLineInformation = 1; fprintf(_fTables, "CEventHandlerEntry %s_handlers[] = {\n", _strCurrentClass); @@ -2870,7 +2870,7 @@ yyreduce: break; case 38: -#line 416 "./Ecc/Parser.y" +#line 416 "Ecc/Parser.y" { _bInProcedure = 1; @@ -2878,13 +2878,13 @@ yyreduce: break; case 39: -#line 419 "./Ecc/Parser.y" +#line 419 "Ecc/Parser.y" { ;} break; case 40: -#line 420 "./Ecc/Parser.y" +#line 420 "Ecc/Parser.y" { fprintf(_fTables, "};\n#define %s_handlersct ARRAYCOUNT(%s_handlers)\n", _strCurrentClass, _strCurrentClass); @@ -2950,17 +2950,17 @@ yyreduce: break; case 41: -#line 485 "./Ecc/Parser.y" +#line 485 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (1)]); _bClassIsExported = 0; ;} break; case 42: -#line 486 "./Ecc/Parser.y" +#line 486 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (2)])+" DECL_DLL "; _bClassIsExported = 1; ;} break; case 44: -#line 491 "./Ecc/Parser.y" +#line 491 "Ecc/Parser.y" { _bFeature_ImplementsOnWorldInit = 0; _bFeature_ImplementsOnWorldEnd = 0; @@ -2975,7 +2975,7 @@ yyreduce: break; case 48: -#line 508 "./Ecc/Parser.y" +#line 508 "Ecc/Parser.y" { if (strcmp((yyvsp[(1) - (1)]).strString, "\"AbstractBaseClass\"")==0) { _bFeature_AbstractBaseClass = 1; @@ -3019,14 +3019,14 @@ yyreduce: break; case 53: -#line 559 "./Ecc/Parser.y" +#line 559 "Ecc/Parser.y" { fprintf(_fDeclaration, "%s %s;\n", (yyvsp[(1) - (3)]).strString, (yyvsp[(2) - (3)]).strString); ;} break; case 54: -#line 569 "./Ecc/Parser.y" +#line 569 "Ecc/Parser.y" { DeclareFeatureProperties(); // this won't work, but at least it will generate an error!!!! fprintf(_fTables, " CEntityProperty()\n};\n"); @@ -3037,7 +3037,7 @@ yyreduce: break; case 55: -#line 576 "./Ecc/Parser.y" +#line 576 "Ecc/Parser.y" { DeclareFeatureProperties(); fprintf(_fTables, "};\n"); @@ -3048,7 +3048,7 @@ yyreduce: break; case 59: -#line 593 "./Ecc/Parser.y" +#line 593 "Ecc/Parser.y" { fprintf(_fTables, " CEntityProperty(%s, %s, (0x%08x<<8)+%s, _offsetof(%s, %s), %s, %s, %s, %s),\n", _strCurrentPropertyPropertyType, @@ -3073,17 +3073,17 @@ yyreduce: break; case 60: -#line 616 "./Ecc/Parser.y" +#line 616 "Ecc/Parser.y" { _strCurrentPropertyID = (yyvsp[(1) - (1)]).strString; ;} break; case 61: -#line 617 "./Ecc/Parser.y" +#line 617 "Ecc/Parser.y" { _strCurrentPropertyIdentifier = (yyvsp[(1) - (1)]).strString; ;} break; case 62: -#line 620 "./Ecc/Parser.y" +#line 620 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ENUM"; _strCurrentPropertyEnumType = (SType("&")+(yyvsp[(2) - (2)])+"_enum").strString; @@ -3092,7 +3092,7 @@ yyreduce: break; case 63: -#line 625 "./Ecc/Parser.y" +#line 625 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLAGS"; _strCurrentPropertyEnumType = (SType("&")+(yyvsp[(2) - (2)])+"_enum").strString; @@ -3101,7 +3101,7 @@ yyreduce: break; case 64: -#line 630 "./Ecc/Parser.y" +#line 630 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_STRING"; _strCurrentPropertyEnumType = "NULL"; @@ -3110,7 +3110,7 @@ yyreduce: break; case 65: -#line 635 "./Ecc/Parser.y" +#line 635 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_STRINGTRANS"; _strCurrentPropertyEnumType = "NULL"; @@ -3119,7 +3119,7 @@ yyreduce: break; case 66: -#line 640 "./Ecc/Parser.y" +#line 640 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FILENAME"; _strCurrentPropertyEnumType = "NULL"; @@ -3128,7 +3128,7 @@ yyreduce: break; case 67: -#line 645 "./Ecc/Parser.y" +#line 645 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FILENAMENODEP"; _strCurrentPropertyEnumType = "NULL"; @@ -3137,7 +3137,7 @@ yyreduce: break; case 68: -#line 650 "./Ecc/Parser.y" +#line 650 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_BOOL"; _strCurrentPropertyEnumType = "NULL"; @@ -3146,7 +3146,7 @@ yyreduce: break; case 69: -#line 655 "./Ecc/Parser.y" +#line 655 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_COLOR"; _strCurrentPropertyEnumType = "NULL"; @@ -3155,7 +3155,7 @@ yyreduce: break; case 70: -#line 660 "./Ecc/Parser.y" +#line 660 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOAT"; _strCurrentPropertyEnumType = "NULL"; @@ -3164,7 +3164,7 @@ yyreduce: break; case 71: -#line 665 "./Ecc/Parser.y" +#line 665 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_INDEX"; _strCurrentPropertyEnumType = "NULL"; @@ -3173,7 +3173,7 @@ yyreduce: break; case 72: -#line 670 "./Ecc/Parser.y" +#line 670 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_RANGE"; _strCurrentPropertyEnumType = "NULL"; @@ -3182,7 +3182,7 @@ yyreduce: break; case 73: -#line 675 "./Ecc/Parser.y" +#line 675 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ENTITYPTR"; _strCurrentPropertyEnumType = "NULL"; @@ -3191,7 +3191,7 @@ yyreduce: break; case 74: -#line 680 "./Ecc/Parser.y" +#line 680 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_MODELOBJECT"; _strCurrentPropertyEnumType = "NULL"; @@ -3200,7 +3200,7 @@ yyreduce: break; case 75: -#line 685 "./Ecc/Parser.y" +#line 685 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_MODELINSTANCE"; _strCurrentPropertyEnumType = "NULL"; @@ -3209,7 +3209,7 @@ yyreduce: break; case 76: -#line 690 "./Ecc/Parser.y" +#line 690 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ANIMOBJECT"; _strCurrentPropertyEnumType = "NULL"; @@ -3218,7 +3218,7 @@ yyreduce: break; case 77: -#line 695 "./Ecc/Parser.y" +#line 695 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_SOUNDOBJECT"; _strCurrentPropertyEnumType = "NULL"; @@ -3227,7 +3227,7 @@ yyreduce: break; case 78: -#line 700 "./Ecc/Parser.y" +#line 700 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_PLACEMENT3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3236,7 +3236,7 @@ yyreduce: break; case 79: -#line 705 "./Ecc/Parser.y" +#line 705 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOATAABBOX3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3245,7 +3245,7 @@ yyreduce: break; case 80: -#line 710 "./Ecc/Parser.y" +#line 710 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOATMATRIX3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3254,7 +3254,7 @@ yyreduce: break; case 81: -#line 715 "./Ecc/Parser.y" +#line 715 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOATQUAT3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3263,7 +3263,7 @@ yyreduce: break; case 82: -#line 720 "./Ecc/Parser.y" +#line 720 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ANGLE"; _strCurrentPropertyEnumType = "NULL"; @@ -3272,7 +3272,7 @@ yyreduce: break; case 83: -#line 725 "./Ecc/Parser.y" +#line 725 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ANGLE3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3281,7 +3281,7 @@ yyreduce: break; case 84: -#line 730 "./Ecc/Parser.y" +#line 730 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOAT3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3290,7 +3290,7 @@ yyreduce: break; case 85: -#line 735 "./Ecc/Parser.y" +#line 735 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_FLOATplane3D"; _strCurrentPropertyEnumType = "NULL"; @@ -3299,7 +3299,7 @@ yyreduce: break; case 86: -#line 740 "./Ecc/Parser.y" +#line 740 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ILLUMINATIONTYPE"; _strCurrentPropertyEnumType = "NULL"; @@ -3308,7 +3308,7 @@ yyreduce: break; case 87: -#line 745 "./Ecc/Parser.y" +#line 745 "Ecc/Parser.y" { _strCurrentPropertyPropertyType = "CEntityProperty::EPT_ANIMATION"; _strCurrentPropertyEnumType = "NULL"; @@ -3317,7 +3317,7 @@ yyreduce: break; case 88: -#line 753 "./Ecc/Parser.y" +#line 753 "Ecc/Parser.y" { _strCurrentPropertyName = "\"\""; _strCurrentPropertyShortcut = "0"; @@ -3326,56 +3326,56 @@ yyreduce: break; case 89: -#line 758 "./Ecc/Parser.y" +#line 758 "Ecc/Parser.y" { _strCurrentPropertyName = (yyvsp[(1) - (3)]).strString; ;} break; case 90: -#line 763 "./Ecc/Parser.y" +#line 763 "Ecc/Parser.y" { _strCurrentPropertyShortcut = "0"; ;} break; case 91: -#line 766 "./Ecc/Parser.y" +#line 766 "Ecc/Parser.y" { _strCurrentPropertyShortcut = (yyvsp[(1) - (1)]).strString; ;} break; case 92: -#line 771 "./Ecc/Parser.y" +#line 771 "Ecc/Parser.y" { _strCurrentPropertyColor = "0x7F0000FFUL"; // dark red ;} break; case 93: -#line 774 "./Ecc/Parser.y" +#line 774 "Ecc/Parser.y" { _strCurrentPropertyColor = (yyvsp[(3) - (4)]).strString; ;} break; case 94: -#line 778 "./Ecc/Parser.y" +#line 778 "Ecc/Parser.y" { _strCurrentPropertyFlags = "0"; // dark red ;} break; case 95: -#line 781 "./Ecc/Parser.y" +#line 781 "Ecc/Parser.y" { _strCurrentPropertyFlags = (yyvsp[(3) - (4)]).strString; ;} break; case 96: -#line 786 "./Ecc/Parser.y" +#line 786 "Ecc/Parser.y" { if (strcmp(_strCurrentPropertyDataType,"CEntityPointer")==0) { _strCurrentPropertyDefaultCode = (SType(_strCurrentPropertyIdentifier)+" = NULL;").strString; @@ -3401,7 +3401,7 @@ yyreduce: break; case 97: -#line 808 "./Ecc/Parser.y" +#line 808 "Ecc/Parser.y" { if (strcmp(_strCurrentPropertyDataType,"CEntityPointer")==0) { yyerror("CEntityPointer type properties always default to NULL"); @@ -3412,32 +3412,32 @@ yyreduce: break; case 103: -#line 818 "./Ecc/Parser.y" +#line 818 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (1)]) + " ";;} break; case 104: -#line 819 "./Ecc/Parser.y" +#line 819 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (4)])+(yyvsp[(2) - (4)])+(yyvsp[(3) - (4)])+(yyvsp[(4) - (4)]);;} break; case 105: -#line 820 "./Ecc/Parser.y" +#line 820 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (4)])+(yyvsp[(2) - (4)])+(yyvsp[(3) - (4)])+(yyvsp[(4) - (4)]);;} break; case 106: -#line 821 "./Ecc/Parser.y" +#line 821 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 107: -#line 822 "./Ecc/Parser.y" +#line 822 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 108: -#line 829 "./Ecc/Parser.y" +#line 829 "Ecc/Parser.y" { fprintf(_fTables, " CEntityComponent()\n};\n"); fprintf(_fTables, "#define %s_componentsct 0\n", _strCurrentClass); @@ -3447,7 +3447,7 @@ yyreduce: break; case 109: -#line 835 "./Ecc/Parser.y" +#line 835 "Ecc/Parser.y" { fprintf(_fTables, "};\n"); fprintf(_fTables, "#define %s_componentsct ARRAYCOUNT(%s_components)\n", @@ -3457,7 +3457,7 @@ yyreduce: break; case 113: -#line 851 "./Ecc/Parser.y" +#line 851 "Ecc/Parser.y" { fprintf(_fTables, "#define %s ((0x%08x<<8)+%s)\n", _strCurrentComponentIdentifier, @@ -3472,52 +3472,52 @@ yyreduce: break; case 114: -#line 864 "./Ecc/Parser.y" +#line 864 "Ecc/Parser.y" { _strCurrentComponentID = (yyvsp[(1) - (1)]).strString; ;} break; case 115: -#line 865 "./Ecc/Parser.y" +#line 865 "Ecc/Parser.y" { _strCurrentComponentIdentifier = (yyvsp[(1) - (1)]).strString; ;} break; case 116: -#line 866 "./Ecc/Parser.y" +#line 866 "Ecc/Parser.y" { _strCurrentComponentFileName = (yyvsp[(1) - (1)]).strString; ;} break; case 117: -#line 869 "./Ecc/Parser.y" +#line 869 "Ecc/Parser.y" { _strCurrentComponentType = "ECT_MODEL"; ;} break; case 118: -#line 870 "./Ecc/Parser.y" +#line 870 "Ecc/Parser.y" { _strCurrentComponentType = "ECT_TEXTURE"; ;} break; case 119: -#line 871 "./Ecc/Parser.y" +#line 871 "Ecc/Parser.y" { _strCurrentComponentType = "ECT_SOUND"; ;} break; case 120: -#line 872 "./Ecc/Parser.y" +#line 872 "Ecc/Parser.y" { _strCurrentComponentType = "ECT_CLASS"; ;} break; case 121: -#line 879 "./Ecc/Parser.y" +#line 879 "Ecc/Parser.y" { (yyval) = "";;} break; case 122: -#line 880 "./Ecc/Parser.y" +#line 880 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 123: -#line 885 "./Ecc/Parser.y" +#line 885 "Ecc/Parser.y" { const char *strReturnType = (yyvsp[(3) - (13)]).strString; const char *strFunctionHeader = ((yyvsp[(4) - (13)])+(yyvsp[(5) - (13)])+(yyvsp[(6) - (13)])+(yyvsp[(7) - (13)])+(yyvsp[(8) - (13)])+(yyvsp[(9) - (13)])).strString; @@ -3537,22 +3537,22 @@ yyreduce: break; case 124: -#line 903 "./Ecc/Parser.y" +#line 903 "Ecc/Parser.y" { (yyval) = "";;} break; case 125: -#line 904 "./Ecc/Parser.y" +#line 904 "Ecc/Parser.y" { (yyval) = " ~ "; ;} break; case 126: -#line 908 "./Ecc/Parser.y" +#line 908 "Ecc/Parser.y" { (yyval) = "";;} break; case 127: -#line 909 "./Ecc/Parser.y" +#line 909 "Ecc/Parser.y" { if (_bClassIsExported) { (yyval) = ""; @@ -3563,109 +3563,109 @@ yyreduce: break; case 128: -#line 919 "./Ecc/Parser.y" +#line 919 "Ecc/Parser.y" { (yyval) = "";;} break; case 129: -#line 920 "./Ecc/Parser.y" +#line 920 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (1)]); ;} break; case 130: -#line 923 "./Ecc/Parser.y" +#line 923 "Ecc/Parser.y" { (yyval) = "";;} break; case 131: -#line 924 "./Ecc/Parser.y" +#line 924 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (1)]); ;} break; case 134: -#line 931 "./Ecc/Parser.y" +#line 931 "Ecc/Parser.y" { (yyval) = "";;} break; case 138: -#line 937 "./Ecc/Parser.y" +#line 937 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 139: -#line 940 "./Ecc/Parser.y" +#line 940 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 144: -#line 951 "./Ecc/Parser.y" +#line 951 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 145: -#line 952 "./Ecc/Parser.y" +#line 952 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 146: -#line 953 "./Ecc/Parser.y" +#line 953 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 147: -#line 954 "./Ecc/Parser.y" +#line 954 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 148: -#line 955 "./Ecc/Parser.y" +#line 955 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 149: -#line 956 "./Ecc/Parser.y" +#line 956 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 150: -#line 957 "./Ecc/Parser.y" +#line 957 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 151: -#line 958 "./Ecc/Parser.y" +#line 958 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 152: -#line 959 "./Ecc/Parser.y" +#line 959 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (4)])+" "+(yyvsp[(2) - (4)])+" "+(yyvsp[(3) - (4)])+" "+(yyvsp[(4) - (4)]); ;} break; case 153: -#line 967 "./Ecc/Parser.y" +#line 967 "Ecc/Parser.y" { (yyval) = "";;} break; case 154: -#line 968 "./Ecc/Parser.y" +#line 968 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 155: -#line 972 "./Ecc/Parser.y" +#line 972 "Ecc/Parser.y" { (yyval) = "-1"; ;} break; case 156: -#line 973 "./Ecc/Parser.y" +#line 973 "Ecc/Parser.y" { (yyval) = SType("STATE_")+(yyvsp[(2) - (5)])+"_"+(yyvsp[(5) - (5)]); ;} break; case 157: -#line 979 "./Ecc/Parser.y" +#line 979 "Ecc/Parser.y" { char *strProcedureName = (yyvsp[(1) - (5)]).strString; char strInputEventType[80]; @@ -3701,7 +3701,7 @@ yyreduce: break; case 158: -#line 1010 "./Ecc/Parser.y" +#line 1010 "Ecc/Parser.y" { char *strFunctionBody = (yyvsp[(8) - (10)]).strString; fprintf(_fImplementation, "%s ASSERT(FALSE); return TRUE;};", strFunctionBody); @@ -3709,203 +3709,203 @@ yyreduce: break; case 159: -#line 1017 "./Ecc/Parser.y" +#line 1017 "Ecc/Parser.y" { (yyval)="EVoid e"; ;} break; case 160: -#line 1020 "./Ecc/Parser.y" +#line 1020 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (1)])+" e"; ;} break; case 161: -#line 1023 "./Ecc/Parser.y" +#line 1023 "Ecc/Parser.y" { (yyval)=(yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]); ;} break; case 167: -#line 1030 "./Ecc/Parser.y" +#line 1030 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (1)]) + " ";;} break; case 188: -#line 1033 "./Ecc/Parser.y" +#line 1033 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 189: -#line 1034 "./Ecc/Parser.y" +#line 1034 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 190: -#line 1035 "./Ecc/Parser.y" +#line 1035 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 191: -#line 1036 "./Ecc/Parser.y" +#line 1036 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 192: -#line 1037 "./Ecc/Parser.y" +#line 1037 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 193: -#line 1038 "./Ecc/Parser.y" +#line 1038 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 194: -#line 1039 "./Ecc/Parser.y" +#line 1039 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 195: -#line 1040 "./Ecc/Parser.y" +#line 1040 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 196: -#line 1041 "./Ecc/Parser.y" +#line 1041 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 197: -#line 1042 "./Ecc/Parser.y" +#line 1042 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 198: -#line 1043 "./Ecc/Parser.y" +#line 1043 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 199: -#line 1044 "./Ecc/Parser.y" +#line 1044 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 200: -#line 1045 "./Ecc/Parser.y" +#line 1045 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 201: -#line 1046 "./Ecc/Parser.y" +#line 1046 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 202: -#line 1047 "./Ecc/Parser.y" +#line 1047 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 203: -#line 1048 "./Ecc/Parser.y" +#line 1048 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 204: -#line 1049 "./Ecc/Parser.y" +#line 1049 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 205: -#line 1050 "./Ecc/Parser.y" +#line 1050 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 206: -#line 1051 "./Ecc/Parser.y" +#line 1051 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 207: -#line 1052 "./Ecc/Parser.y" +#line 1052 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 208: -#line 1053 "./Ecc/Parser.y" +#line 1053 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 209: -#line 1054 "./Ecc/Parser.y" +#line 1054 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 210: -#line 1055 "./Ecc/Parser.y" +#line 1055 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 211: -#line 1056 "./Ecc/Parser.y" +#line 1056 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 212: -#line 1057 "./Ecc/Parser.y" +#line 1057 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 213: -#line 1058 "./Ecc/Parser.y" +#line 1058 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (2)])+" "+(yyvsp[(2) - (2)]);;} break; case 245: -#line 1071 "./Ecc/Parser.y" +#line 1071 "Ecc/Parser.y" {(yyval) = (yyvsp[(1) - (1)]) + " ";;} break; case 246: -#line 1078 "./Ecc/Parser.y" +#line 1078 "Ecc/Parser.y" { (yyval) = "";;} break; case 247: -#line 1079 "./Ecc/Parser.y" +#line 1079 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]); ;} break; case 248: -#line 1082 "./Ecc/Parser.y" +#line 1082 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]);;} break; case 249: -#line 1083 "./Ecc/Parser.y" +#line 1083 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (7)])+(yyvsp[(2) - (7)])+(yyvsp[(3) - (7)])+(yyvsp[(4) - (7)])+(yyvsp[(5) - (7)])+(yyvsp[(6) - (7)])+(yyvsp[(7) - (7)]);} break; case 250: -#line 1084 "./Ecc/Parser.y" +#line 1084 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (3)])+" "+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)])+" ";;} break; case 251: -#line 1085 "./Ecc/Parser.y" +#line 1085 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]);;} break; case 252: -#line 1086 "./Ecc/Parser.y" +#line 1086 "Ecc/Parser.y" {(yyval)=(yyvsp[(1) - (4)])+(yyvsp[(2) - (4)])+(yyvsp[(3) - (4)])+(yyvsp[(4) - (4)]);;} break; case 269: -#line 1107 "./Ecc/Parser.y" +#line 1107 "Ecc/Parser.y" { if ((yyvsp[(6) - (7)]).bCrossesStates) { char strAfterIfName[80], strAfterIfID[11]; @@ -3922,7 +3922,7 @@ yyreduce: break; case 270: -#line 1123 "./Ecc/Parser.y" +#line 1123 "Ecc/Parser.y" { if ((yyvsp[(6) - (9)]).bCrossesStates || (yyvsp[(9) - (9)]).bCrossesStates) { char strAfterIfName[80], strAfterIfID[11]; @@ -3945,7 +3945,7 @@ yyreduce: break; case 271: -#line 1145 "./Ecc/Parser.y" +#line 1145 "Ecc/Parser.y" { if (strlen(_strInLoopName)>0) { yyerror("Nested loops are not implemented yet"); @@ -3954,7 +3954,7 @@ yyreduce: break; case 272: -#line 1149 "./Ecc/Parser.y" +#line 1149 "Ecc/Parser.y" { if ((yyvsp[(7) - (8)]).bCrossesStates) { CreateInternalHandlerFunction(_strInLoopName, _strInLoopID); @@ -3976,7 +3976,7 @@ yyreduce: break; case 273: -#line 1170 "./Ecc/Parser.y" +#line 1170 "Ecc/Parser.y" { if (strlen(_strInLoopName)>0) { yyerror("Nested loops are not implemented yet"); @@ -3986,7 +3986,7 @@ yyreduce: break; case 274: -#line 1175 "./Ecc/Parser.y" +#line 1175 "Ecc/Parser.y" { if ((yyvsp[(3) - (10)]).bCrossesStates) { CreateInternalHandlerFunction(_strInLoopName, _strInLoopID); @@ -4008,7 +4008,7 @@ yyreduce: break; case 275: -#line 1196 "./Ecc/Parser.y" +#line 1196 "Ecc/Parser.y" { if (strlen(_strInLoopName)>0) { yyerror("Nested loops are not implemented yet"); @@ -4017,7 +4017,7 @@ yyreduce: break; case 276: -#line 1200 "./Ecc/Parser.y" +#line 1200 "Ecc/Parser.y" { if ((yyvsp[(11) - (12)]).bCrossesStates) { CreateInternalHandlerFunction(_strInLoopName, _strInLoopID); @@ -4031,7 +4031,7 @@ yyreduce: break; case 277: -#line 1213 "./Ecc/Parser.y" +#line 1213 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'wait' in functions"); @@ -4044,7 +4044,7 @@ yyreduce: break; case 278: -#line 1221 "./Ecc/Parser.y" +#line 1221 "Ecc/Parser.y" { if ((yyvsp[(5) - (6)]).bCrossesStates) { yyerror("'wait' statements must not be nested"); @@ -4072,7 +4072,7 @@ yyreduce: break; case 279: -#line 1247 "./Ecc/Parser.y" +#line 1247 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'autowait' in functions"); @@ -4097,7 +4097,7 @@ yyreduce: break; case 280: -#line 1271 "./Ecc/Parser.y" +#line 1271 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'autocall' in functions"); @@ -4122,21 +4122,21 @@ yyreduce: break; case 281: -#line 1296 "./Ecc/Parser.y" +#line 1296 "Ecc/Parser.y" { (yyval) = SType("__e"); ;} break; case 282: -#line 1299 "./Ecc/Parser.y" +#line 1299 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (1)]); ;} break; case 283: -#line 1304 "./Ecc/Parser.y" +#line 1304 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'autocall' in functions"); @@ -4161,21 +4161,21 @@ yyreduce: break; case 284: -#line 1328 "./Ecc/Parser.y" +#line 1328 "Ecc/Parser.y" { (yyval) = SType("SetTimerAt(THINKTIME_NEVER)"); ;} break; case 285: -#line 1331 "./Ecc/Parser.y" +#line 1331 "Ecc/Parser.y" { (yyval) = SType("SetTimerAfter")+(yyvsp[(1) - (3)])+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]); ;} break; case 286: -#line 1337 "./Ecc/Parser.y" +#line 1337 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'jump' in functions"); @@ -4185,7 +4185,7 @@ yyreduce: break; case 287: -#line 1346 "./Ecc/Parser.y" +#line 1346 "Ecc/Parser.y" { if (!_bInProcedure) { yyerror("Cannot have 'call' in functions"); @@ -4198,35 +4198,35 @@ yyreduce: break; case 288: -#line 1358 "./Ecc/Parser.y" +#line 1358 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (1)]); ;} break; case 289: -#line 1361 "./Ecc/Parser.y" +#line 1361 "Ecc/Parser.y" { (yyval) = SType("EVoid()"); ;} break; case 290: -#line 1367 "./Ecc/Parser.y" +#line 1367 "Ecc/Parser.y" { (yyval) = SType("STATE_")+_strCurrentClass+"_"+(yyvsp[(1) - (1)])+", TRUE"; ;} break; case 291: -#line 1370 "./Ecc/Parser.y" +#line 1370 "Ecc/Parser.y" { (yyval) = SType("STATE_")+(yyvsp[(1) - (4)])+"_"+(yyvsp[(4) - (4)])+", FALSE"; ;} break; case 292: -#line 1376 "./Ecc/Parser.y" +#line 1376 "Ecc/Parser.y" { (yyval) = SType(GetLineDirective((yyvsp[(1) - (2)])))+"UnsetTimer();Jump(STATE_CURRENT," +_strAfterWaitID+", FALSE, EInternal());"+"return TRUE"+(yyvsp[(2) - (2)]); @@ -4234,21 +4234,21 @@ yyreduce: break; case 293: -#line 1382 "./Ecc/Parser.y" +#line 1382 "Ecc/Parser.y" { (yyval) = SType(GetLineDirective((yyvsp[(1) - (2)])))+"return TRUE"+(yyvsp[(2) - (2)]); ;} break; case 294: -#line 1387 "./Ecc/Parser.y" +#line 1387 "Ecc/Parser.y" { (yyval) = SType(GetLineDirective((yyvsp[(1) - (2)])))+"return FALSE"+(yyvsp[(2) - (2)]); ;} break; case 295: -#line 1392 "./Ecc/Parser.y" +#line 1392 "Ecc/Parser.y" { if (!_bInProcedure) { (yyval) = (yyvsp[(1) - (3)])+" "+(yyvsp[(2) - (3)])+(yyvsp[(3) - (3)]); @@ -4264,12 +4264,12 @@ yyreduce: break; case 296: -#line 1406 "./Ecc/Parser.y" +#line 1406 "Ecc/Parser.y" {(yyval) = "";;} break; case 298: -#line 1411 "./Ecc/Parser.y" +#line 1411 "Ecc/Parser.y" { char strInputEventType[80]; char strInputEventName[80]; @@ -4282,7 +4282,7 @@ yyreduce: break; case 299: -#line 1420 "./Ecc/Parser.y" +#line 1420 "Ecc/Parser.y" { char strInputEventType[80]; char strInputEventName[80]; @@ -4294,18 +4294,18 @@ yyreduce: break; case 300: -#line 1430 "./Ecc/Parser.y" +#line 1430 "Ecc/Parser.y" { (yyval) = "";;} break; case 301: -#line 1431 "./Ecc/Parser.y" +#line 1431 "Ecc/Parser.y" { (yyval) = (yyvsp[(1) - (2)])+(yyvsp[(2) - (2)]); ;} break; /* Line 1267 of yacc.c. */ -#line 4309 "./Ecc/Parser.cpp" +#line 4309 "Ecc/Parser.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4519,6 +4519,6 @@ yyreturn: } -#line 1434 "./Ecc/Parser.y" +#line 1434 "Ecc/Parser.y" diff --git a/Sources/Ecc/Scanner.cpp b/Sources/Ecc/Scanner.cpp index 1972ce0..bb04d8c 100644 --- a/Sources/Ecc/Scanner.cpp +++ b/Sources/Ecc/Scanner.cpp @@ -1,6 +1,6 @@ -#line 2 "./Ecc/Scanner.cpp" +#line 2 "Ecc/Scanner.cpp" -#line 4 "./Ecc/Scanner.cpp" +#line 4 "Ecc/Scanner.cpp" #define YY_INT_ALIGNED short int @@ -716,8 +716,8 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "./Ecc/Scanner.l" -#line 2 "./Ecc/Scanner.l" +#line 1 "Ecc/Scanner.l" +#line 2 "Ecc/Scanner.l" // rcg10042001 Changed to specify Ecc directory... #include "Ecc/StdH.h" #include "Ecc/Main.h" @@ -743,7 +743,7 @@ char *_strCppBlock; -#line 747 "./Ecc/Scanner.cpp" +#line 747 "Ecc/Scanner.cpp" #define INITIAL 0 #define COMMENT 1 @@ -927,11 +927,11 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 38 "./Ecc/Scanner.l" +#line 38 "Ecc/Scanner.l" /* standard cpp-keywords */ -#line 935 "./Ecc/Scanner.cpp" +#line 935 "Ecc/Scanner.cpp" if ( !(yy_init) ) { @@ -1016,374 +1016,374 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 41 "./Ecc/Scanner.l" +#line 41 "Ecc/Scanner.l" {RETURN(k_while);} YY_BREAK case 2: YY_RULE_SETUP -#line 42 "./Ecc/Scanner.l" +#line 42 "Ecc/Scanner.l" {RETURN(k_switch);} YY_BREAK case 3: YY_RULE_SETUP -#line 43 "./Ecc/Scanner.l" +#line 43 "Ecc/Scanner.l" {RETURN(k_case);} YY_BREAK case 4: YY_RULE_SETUP -#line 44 "./Ecc/Scanner.l" +#line 44 "Ecc/Scanner.l" {RETURN(k_for);} YY_BREAK case 5: YY_RULE_SETUP -#line 45 "./Ecc/Scanner.l" +#line 45 "Ecc/Scanner.l" {RETURN(k_if);} YY_BREAK case 6: YY_RULE_SETUP -#line 46 "./Ecc/Scanner.l" +#line 46 "Ecc/Scanner.l" {RETURN(k_else);} YY_BREAK case 7: YY_RULE_SETUP -#line 47 "./Ecc/Scanner.l" +#line 47 "Ecc/Scanner.l" {RETURN(k_enum);} YY_BREAK case 8: YY_RULE_SETUP -#line 48 "./Ecc/Scanner.l" +#line 48 "Ecc/Scanner.l" {RETURN(k_class);} YY_BREAK case 9: YY_RULE_SETUP -#line 49 "./Ecc/Scanner.l" +#line 49 "Ecc/Scanner.l" {RETURN(k_do);} YY_BREAK case 10: YY_RULE_SETUP -#line 50 "./Ecc/Scanner.l" +#line 50 "Ecc/Scanner.l" {RETURN(k_void);} YY_BREAK case 11: YY_RULE_SETUP -#line 51 "./Ecc/Scanner.l" +#line 51 "Ecc/Scanner.l" {RETURN(k_const);} YY_BREAK case 12: YY_RULE_SETUP -#line 52 "./Ecc/Scanner.l" +#line 52 "Ecc/Scanner.l" {RETURN(k_inline);} YY_BREAK case 13: YY_RULE_SETUP -#line 53 "./Ecc/Scanner.l" +#line 53 "Ecc/Scanner.l" {RETURN(k_static);} YY_BREAK case 14: YY_RULE_SETUP -#line 54 "./Ecc/Scanner.l" +#line 54 "Ecc/Scanner.l" {RETURN(k_virtual);} YY_BREAK case 15: YY_RULE_SETUP -#line 55 "./Ecc/Scanner.l" +#line 55 "Ecc/Scanner.l" {RETURN(k_return);} YY_BREAK case 16: YY_RULE_SETUP -#line 56 "./Ecc/Scanner.l" +#line 56 "Ecc/Scanner.l" {RETURN(k_autowait);} YY_BREAK case 17: YY_RULE_SETUP -#line 57 "./Ecc/Scanner.l" +#line 57 "Ecc/Scanner.l" {RETURN(k_autocall);} YY_BREAK case 18: YY_RULE_SETUP -#line 58 "./Ecc/Scanner.l" +#line 58 "Ecc/Scanner.l" {RETURN(k_waitevent);} YY_BREAK /* aditional keywords */ case 19: YY_RULE_SETUP -#line 61 "./Ecc/Scanner.l" +#line 61 "Ecc/Scanner.l" {RETURN(k_event);} YY_BREAK case 20: YY_RULE_SETUP -#line 62 "./Ecc/Scanner.l" +#line 62 "Ecc/Scanner.l" {RETURN(k_name);} YY_BREAK case 21: YY_RULE_SETUP -#line 63 "./Ecc/Scanner.l" +#line 63 "Ecc/Scanner.l" {RETURN(k_thumbnail);} YY_BREAK case 22: YY_RULE_SETUP -#line 64 "./Ecc/Scanner.l" +#line 64 "Ecc/Scanner.l" {RETURN(k_features);} YY_BREAK case 23: YY_RULE_SETUP -#line 65 "./Ecc/Scanner.l" +#line 65 "Ecc/Scanner.l" {RETURN(k_uses);} YY_BREAK case 24: YY_RULE_SETUP -#line 66 "./Ecc/Scanner.l" +#line 66 "Ecc/Scanner.l" {RETURN(k_export);} YY_BREAK case 25: YY_RULE_SETUP -#line 68 "./Ecc/Scanner.l" +#line 68 "Ecc/Scanner.l" {RETURN(k_texture);} YY_BREAK case 26: YY_RULE_SETUP -#line 69 "./Ecc/Scanner.l" +#line 69 "Ecc/Scanner.l" {RETURN(k_sound);} YY_BREAK case 27: YY_RULE_SETUP -#line 70 "./Ecc/Scanner.l" +#line 70 "Ecc/Scanner.l" {RETURN(k_model);} YY_BREAK case 28: YY_RULE_SETUP -#line 72 "./Ecc/Scanner.l" +#line 72 "Ecc/Scanner.l" {RETURN(k_properties);} YY_BREAK case 29: YY_RULE_SETUP -#line 73 "./Ecc/Scanner.l" +#line 73 "Ecc/Scanner.l" {RETURN(k_components);} YY_BREAK case 30: YY_RULE_SETUP -#line 74 "./Ecc/Scanner.l" +#line 74 "Ecc/Scanner.l" {RETURN(k_functions);} YY_BREAK case 31: YY_RULE_SETUP -#line 75 "./Ecc/Scanner.l" +#line 75 "Ecc/Scanner.l" {RETURN(k_procedures);} YY_BREAK case 32: YY_RULE_SETUP -#line 77 "./Ecc/Scanner.l" +#line 77 "Ecc/Scanner.l" {RETURN(k_wait );} YY_BREAK case 33: YY_RULE_SETUP -#line 78 "./Ecc/Scanner.l" +#line 78 "Ecc/Scanner.l" {RETURN(k_on );} YY_BREAK case 34: YY_RULE_SETUP -#line 79 "./Ecc/Scanner.l" +#line 79 "Ecc/Scanner.l" {RETURN(k_otherwise);} YY_BREAK case 35: YY_RULE_SETUP -#line 81 "./Ecc/Scanner.l" +#line 81 "Ecc/Scanner.l" {RETURN(k_call );} YY_BREAK case 36: YY_RULE_SETUP -#line 82 "./Ecc/Scanner.l" +#line 82 "Ecc/Scanner.l" {RETURN(k_jump );} YY_BREAK case 37: YY_RULE_SETUP -#line 83 "./Ecc/Scanner.l" +#line 83 "Ecc/Scanner.l" {RETURN(k_stop );} YY_BREAK case 38: YY_RULE_SETUP -#line 84 "./Ecc/Scanner.l" +#line 84 "Ecc/Scanner.l" {RETURN(k_resume );} YY_BREAK case 39: YY_RULE_SETUP -#line 85 "./Ecc/Scanner.l" +#line 85 "Ecc/Scanner.l" {RETURN(k_pass );} YY_BREAK /* special data types */ case 40: YY_RULE_SETUP -#line 88 "./Ecc/Scanner.l" +#line 88 "Ecc/Scanner.l" {RETURN(k_CTString);} YY_BREAK case 41: YY_RULE_SETUP -#line 89 "./Ecc/Scanner.l" +#line 89 "Ecc/Scanner.l" {RETURN(k_CTStringTrans);} YY_BREAK case 42: YY_RULE_SETUP -#line 90 "./Ecc/Scanner.l" +#line 90 "Ecc/Scanner.l" {RETURN(k_CTFileName);} YY_BREAK case 43: YY_RULE_SETUP -#line 91 "./Ecc/Scanner.l" +#line 91 "Ecc/Scanner.l" {RETURN(k_CTFileNameNoDep);} YY_BREAK case 44: YY_RULE_SETUP -#line 92 "./Ecc/Scanner.l" +#line 92 "Ecc/Scanner.l" {RETURN(k_BOOL);} YY_BREAK case 45: YY_RULE_SETUP -#line 93 "./Ecc/Scanner.l" +#line 93 "Ecc/Scanner.l" {RETURN(k_COLOR);} YY_BREAK case 46: YY_RULE_SETUP -#line 94 "./Ecc/Scanner.l" +#line 94 "Ecc/Scanner.l" {RETURN(k_FLOAT);} YY_BREAK case 47: YY_RULE_SETUP -#line 95 "./Ecc/Scanner.l" +#line 95 "Ecc/Scanner.l" {RETURN(k_INDEX);} YY_BREAK case 48: YY_RULE_SETUP -#line 96 "./Ecc/Scanner.l" +#line 96 "Ecc/Scanner.l" {RETURN(k_RANGE);} YY_BREAK case 49: YY_RULE_SETUP -#line 97 "./Ecc/Scanner.l" +#line 97 "Ecc/Scanner.l" {RETURN(k_CEntityPointer);} YY_BREAK case 50: YY_RULE_SETUP -#line 98 "./Ecc/Scanner.l" +#line 98 "Ecc/Scanner.l" {RETURN(k_CModelObject);} YY_BREAK case 51: YY_RULE_SETUP -#line 99 "./Ecc/Scanner.l" +#line 99 "Ecc/Scanner.l" {RETURN(k_CModelInstance);} YY_BREAK case 52: YY_RULE_SETUP -#line 100 "./Ecc/Scanner.l" +#line 100 "Ecc/Scanner.l" {RETURN(k_CAnimObject);} YY_BREAK case 53: YY_RULE_SETUP -#line 101 "./Ecc/Scanner.l" +#line 101 "Ecc/Scanner.l" {RETURN(k_CSoundObject);} YY_BREAK case 54: YY_RULE_SETUP -#line 102 "./Ecc/Scanner.l" +#line 102 "Ecc/Scanner.l" {RETURN(k_CPlacement3D);} YY_BREAK case 55: YY_RULE_SETUP -#line 103 "./Ecc/Scanner.l" +#line 103 "Ecc/Scanner.l" {RETURN(k_FLOATaabbox3D);} YY_BREAK case 56: YY_RULE_SETUP -#line 104 "./Ecc/Scanner.l" +#line 104 "Ecc/Scanner.l" {RETURN(k_FLOATmatrix3D);} YY_BREAK case 57: YY_RULE_SETUP -#line 105 "./Ecc/Scanner.l" +#line 105 "Ecc/Scanner.l" {RETURN(k_FLOATquat3D);} YY_BREAK case 58: YY_RULE_SETUP -#line 106 "./Ecc/Scanner.l" +#line 106 "Ecc/Scanner.l" {RETURN(k_ANGLE);}; YY_BREAK case 59: YY_RULE_SETUP -#line 107 "./Ecc/Scanner.l" +#line 107 "Ecc/Scanner.l" {RETURN(k_ANIMATION);}; YY_BREAK case 60: YY_RULE_SETUP -#line 108 "./Ecc/Scanner.l" +#line 108 "Ecc/Scanner.l" {RETURN(k_ILLUMINATIONTYPE);}; YY_BREAK case 61: YY_RULE_SETUP -#line 109 "./Ecc/Scanner.l" +#line 109 "Ecc/Scanner.l" {RETURN(k_FLOAT3D);}; YY_BREAK case 62: YY_RULE_SETUP -#line 110 "./Ecc/Scanner.l" +#line 110 "Ecc/Scanner.l" {RETURN(k_ANGLE3D);}; YY_BREAK case 63: YY_RULE_SETUP -#line 111 "./Ecc/Scanner.l" +#line 111 "Ecc/Scanner.l" {RETURN(k_FLOATplane3D);}; YY_BREAK case 64: YY_RULE_SETUP -#line 112 "./Ecc/Scanner.l" +#line 112 "Ecc/Scanner.l" {RETURN(k_FLAGS);}; YY_BREAK /* single character operators and punctuations */ case 65: YY_RULE_SETUP -#line 115 "./Ecc/Scanner.l" +#line 115 "Ecc/Scanner.l" { RETURN(yytext[0]);} YY_BREAK /* constants */ case 66: YY_RULE_SETUP -#line 119 "./Ecc/Scanner.l" +#line 119 "Ecc/Scanner.l" { RETURN(c_int); } YY_BREAK case 67: YY_RULE_SETUP -#line 120 "./Ecc/Scanner.l" +#line 120 "Ecc/Scanner.l" { RETURN(c_int)}; YY_BREAK case 68: YY_RULE_SETUP -#line 121 "./Ecc/Scanner.l" +#line 121 "Ecc/Scanner.l" { RETURN(c_int); } YY_BREAK case 69: YY_RULE_SETUP -#line 122 "./Ecc/Scanner.l" +#line 122 "Ecc/Scanner.l" { RETURN(c_int); } YY_BREAK case 70: YY_RULE_SETUP -#line 123 "./Ecc/Scanner.l" +#line 123 "Ecc/Scanner.l" { RETURN(c_string); } YY_BREAK case 71: YY_RULE_SETUP -#line 124 "./Ecc/Scanner.l" +#line 124 "Ecc/Scanner.l" { RETURN(c_char); } YY_BREAK /* identifier */ case 72: YY_RULE_SETUP -#line 127 "./Ecc/Scanner.l" +#line 127 "Ecc/Scanner.l" {RETURN(identifier);} YY_BREAK /* specially bracketed cpp blocks */ case 73: YY_RULE_SETUP -#line 130 "./Ecc/Scanner.l" +#line 130 "Ecc/Scanner.l" { char strLine[80]; sprintf(strLine, "#line %d \"%s\"\n", _iLinesCt, _strInputFileName ); @@ -1393,7 +1393,7 @@ YY_RULE_SETUP YY_BREAK case 74: YY_RULE_SETUP -#line 136 "./Ecc/Scanner.l" +#line 136 "Ecc/Scanner.l" { BEGIN(INITIAL); yylval = SType(_strCppBlock); @@ -1403,7 +1403,7 @@ YY_RULE_SETUP case 75: /* rule 75 can match eol */ YY_RULE_SETUP -#line 141 "./Ecc/Scanner.l" +#line 141 "Ecc/Scanner.l" { _iLinesCt++; _strCppBlock = (SType(_strCppBlock)+yytext).strString; @@ -1411,7 +1411,7 @@ YY_RULE_SETUP YY_BREAK case 76: YY_RULE_SETUP -#line 145 "./Ecc/Scanner.l" +#line 145 "Ecc/Scanner.l" { _strCppBlock = (SType(_strCppBlock)+yytext).strString; } @@ -1419,29 +1419,29 @@ YY_RULE_SETUP /* eat up comments */ case 77: YY_RULE_SETUP -#line 150 "./Ecc/Scanner.l" +#line 150 "Ecc/Scanner.l" { BEGIN(COMMENT); } YY_BREAK case 78: YY_RULE_SETUP -#line 151 "./Ecc/Scanner.l" +#line 151 "Ecc/Scanner.l" { BEGIN(INITIAL); } YY_BREAK case 79: YY_RULE_SETUP -#line 152 "./Ecc/Scanner.l" +#line 152 "Ecc/Scanner.l" {} YY_BREAK case 80: /* rule 80 can match eol */ YY_RULE_SETUP -#line 153 "./Ecc/Scanner.l" +#line 153 "Ecc/Scanner.l" { _iLinesCt++; } YY_BREAK /* eat up whitespace */ case 81: YY_RULE_SETUP -#line 156 "./Ecc/Scanner.l" +#line 156 "Ecc/Scanner.l" { } YY_BREAK @@ -1449,7 +1449,7 @@ YY_RULE_SETUP case 82: /* rule 82 can match eol */ YY_RULE_SETUP -#line 159 "./Ecc/Scanner.l" +#line 159 "Ecc/Scanner.l" { _iLinesCt++; } @@ -1457,7 +1457,7 @@ YY_RULE_SETUP /* for all unrecognized characters */ case 83: YY_RULE_SETUP -#line 163 "./Ecc/Scanner.l" +#line 163 "Ecc/Scanner.l" { // report an error char strError[80]; @@ -1468,10 +1468,10 @@ YY_RULE_SETUP YY_BREAK case 84: YY_RULE_SETUP -#line 171 "./Ecc/Scanner.l" +#line 171 "Ecc/Scanner.l" ECHO; YY_BREAK -#line 1475 "./Ecc/Scanner.cpp" +#line 1475 "Ecc/Scanner.cpp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(CPPBLOCK): @@ -2470,7 +2470,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 171 "./Ecc/Scanner.l" +#line 171 "Ecc/Scanner.l" diff --git a/Sources/Engine/Base/Parser.cpp b/Sources/Engine/Base/Parser.cpp index 3e9d3ce..6c688a2 100644 --- a/Sources/Engine/Base/Parser.cpp +++ b/Sources/Engine/Base/Parser.cpp @@ -136,7 +136,7 @@ /* Copy the first part of user declarations. */ -#line 1 "./Engine/Base/Parser.y" +#line 1 "Engine/Base/Parser.y" #include @@ -147,7 +147,7 @@ #include #include -#line 13 "./Engine/Base/Parser.y" +#line 13 "Engine/Base/Parser.y" // turn off over-helpful bit of bison... --ryan. #ifdef __GNUC__ @@ -347,7 +347,7 @@ void DoComparison(value &vRes, value &v0, value &v1, int token) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 197 "./Engine/Base/Parser.y" +#line 197 "Engine/Base/Parser.y" { value val; // for constants and expressions arguments arg; // for function input arguments @@ -359,7 +359,7 @@ typedef union YYSTYPE void (*pPostFunc)(INDEX); // post-set function for a variable } /* Line 193 of yacc.c. */ -#line 363 "./Engine/Base/Parser.cpp" +#line 363 "Engine/Base/Parser.cpp" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -369,13 +369,13 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ -#line 208 "./Engine/Base/Parser.y" +#line 208 "Engine/Base/Parser.y" extern int yylex(YYSTYPE *lvalp); /* Line 216 of yacc.c. */ -#line 379 "./Engine/Base/Parser.cpp" +#line 379 "Engine/Base/Parser.cpp" #ifdef short # undef short @@ -1769,49 +1769,49 @@ yyreduce: switch (yyn) { case 8: -#line 290 "./Engine/Base/Parser.y" +#line 290 "Engine/Base/Parser.y" { (yyval.ulFlags) = 0; ;} break; case 9: -#line 293 "./Engine/Base/Parser.y" +#line 293 "Engine/Base/Parser.y" { (yyval.ulFlags) = (yyvsp[(1) - (2)].ulFlags) | SSF_CONSTANT; ;} break; case 10: -#line 296 "./Engine/Base/Parser.y" +#line 296 "Engine/Base/Parser.y" { (yyval.ulFlags) = (yyvsp[(1) - (2)].ulFlags) | SSF_USER; ;} break; case 11: -#line 299 "./Engine/Base/Parser.y" +#line 299 "Engine/Base/Parser.y" { (yyval.ulFlags) = (yyvsp[(1) - (2)].ulFlags) | SSF_PERSISTENT; ;} break; case 12: -#line 302 "./Engine/Base/Parser.y" +#line 302 "Engine/Base/Parser.y" { (yyval.ulFlags) = (yyvsp[(1) - (2)].ulFlags) | SSF_EXTERNAL; ;} break; case 13: -#line 307 "./Engine/Base/Parser.y" +#line 307 "Engine/Base/Parser.y" { (yyval.val).strString = ""; ;} break; case 14: -#line 310 "./Engine/Base/Parser.y" +#line 310 "Engine/Base/Parser.y" { // !!!! remove this option //_pShell->ErrorF("Warning: symbol comments are not supported"); @@ -1820,42 +1820,42 @@ yyreduce: break; case 15: -#line 317 "./Engine/Base/Parser.y" +#line 317 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewFloat(); ;} break; case 16: -#line 320 "./Engine/Base/Parser.y" +#line 320 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewIndex(); ;} break; case 17: -#line 323 "./Engine/Base/Parser.y" +#line 323 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewString(); ;} break; case 18: -#line 326 "./Engine/Base/Parser.y" +#line 326 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewVoid(); ;} break; case 19: -#line 331 "./Engine/Base/Parser.y" +#line 331 "Engine/Base/Parser.y" { (yyval.pPreFunc) = NULL; ;} break; case 20: -#line 334 "./Engine/Base/Parser.y" +#line 334 "Engine/Base/Parser.y" { if (_shell_ast[(yyvsp[(3) - (3)].pssSymbol)->ss_istType].st_sttType!=STT_FUNCTION ||_shell_ast[_shell_ast[(yyvsp[(3) - (3)].pssSymbol)->ss_istType].st_istBaseType].st_sttType!=STT_INDEX @@ -1870,14 +1870,14 @@ yyreduce: break; case 21: -#line 347 "./Engine/Base/Parser.y" +#line 347 "Engine/Base/Parser.y" { (yyval.pPostFunc) = NULL; ;} break; case 22: -#line 350 "./Engine/Base/Parser.y" +#line 350 "Engine/Base/Parser.y" { if (_shell_ast[(yyvsp[(3) - (3)].pssSymbol)->ss_istType].st_sttType!=STT_FUNCTION ||_shell_ast[_shell_ast[(yyvsp[(3) - (3)].pssSymbol)->ss_istType].st_istBaseType].st_sttType!=STT_VOID @@ -1891,7 +1891,7 @@ yyreduce: break; case 23: -#line 363 "./Engine/Base/Parser.y" +#line 363 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewFunction(0); ShellTypeAddFunctionArgument((yyval.istType), ShellTypeNewVoid()); @@ -1899,14 +1899,14 @@ yyreduce: break; case 24: -#line 367 "./Engine/Base/Parser.y" +#line 367 "Engine/Base/Parser.y" { (yyval.istType) = (yyvsp[(1) - (1)].istType); ;} break; case 25: -#line 373 "./Engine/Base/Parser.y" +#line 373 "Engine/Base/Parser.y" { (yyval.istType) = ShellTypeNewFunction(0); ShellTypeAddFunctionArgument((yyval.istType), (yyvsp[(1) - (1)].istType)); @@ -1914,7 +1914,7 @@ yyreduce: break; case 26: -#line 381 "./Engine/Base/Parser.y" +#line 381 "Engine/Base/Parser.y" { (yyval.istType) = (yyvsp[(1) - (3)].istType); ShellTypeAddFunctionArgument((yyval.istType), (yyvsp[(3) - (3)].istType)); @@ -1922,7 +1922,7 @@ yyreduce: break; case 27: -#line 392 "./Engine/Base/Parser.y" +#line 392 "Engine/Base/Parser.y" { Declaration((yyvsp[(1) - (7)].ulFlags), (yyvsp[(2) - (7)].istType), *(yyvsp[(3) - (7)].pssSymbol), (yyvsp[(4) - (7)].pPreFunc), (yyvsp[(5) - (7)].pPostFunc)); ShellTypeDelete((yyvsp[(2) - (7)].istType)); @@ -1930,7 +1930,7 @@ yyreduce: break; case 28: -#line 396 "./Engine/Base/Parser.y" +#line 396 "Engine/Base/Parser.y" { // take function from the parameter list and set its return type _shell_ast[(yyvsp[(5) - (8)].istType)].st_istBaseType = (yyvsp[(2) - (8)].istType); @@ -1943,7 +1943,7 @@ yyreduce: break; case 29: -#line 405 "./Engine/Base/Parser.y" +#line 405 "Engine/Base/Parser.y" { if ((yyvsp[(5) - (10)].val).sttType!=STT_INDEX) { _pShell->ErrorF("Array size is not integral"); @@ -1955,21 +1955,21 @@ yyreduce: break; case 30: -#line 415 "./Engine/Base/Parser.y" +#line 415 "Engine/Base/Parser.y" { // dummy ;} break; case 31: -#line 418 "./Engine/Base/Parser.y" +#line 418 "Engine/Base/Parser.y" { // dummy ;} break; case 32: -#line 421 "./Engine/Base/Parser.y" +#line 421 "Engine/Base/Parser.y" { // print its value if ((yyvsp[(1) - (2)].val).sttType == STT_VOID) { @@ -1987,7 +1987,7 @@ yyreduce: break; case 33: -#line 435 "./Engine/Base/Parser.y" +#line 435 "Engine/Base/Parser.y" { // if it is constant if ((yyvsp[(1) - (4)].lvLValue).lv_pssSymbol->ss_ulFlags&SSF_CONSTANT) { @@ -2029,7 +2029,7 @@ yyreduce: break; case 34: -#line 473 "./Engine/Base/Parser.y" +#line 473 "Engine/Base/Parser.y" { Declaration((yyvsp[(1) - (6)].ulFlags), (yyvsp[(2) - (6)].istType), *(yyvsp[(3) - (6)].pssSymbol), NULL, NULL); ShellTypeDelete((yyvsp[(2) - (6)].istType)); @@ -2067,7 +2067,7 @@ yyreduce: break; case 35: -#line 507 "./Engine/Base/Parser.y" +#line 507 "Engine/Base/Parser.y" { extern void PrintShellSymbolHelp(const CTString &strSymbol); PrintShellSymbolHelp((yyvsp[(2) - (2)].pssSymbol)->ss_strName); @@ -2075,7 +2075,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 36: -#line 511 "./Engine/Base/Parser.y" +#line 511 "Engine/Base/Parser.y" { extern void PrintShellSymbolHelp(const CTString &strSymbol); PrintShellSymbolHelp((yyvsp[(2) - (4)].pssSymbol)->ss_strName); @@ -2083,7 +2083,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 37: -#line 515 "./Engine/Base/Parser.y" +#line 515 "Engine/Base/Parser.y" { extern void PrintShellSymbolHelp(const CTString &strSymbol); PrintShellSymbolHelp((yyvsp[(2) - (4)].pssSymbol)->ss_strName); @@ -2091,7 +2091,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 38: -#line 519 "./Engine/Base/Parser.y" +#line 519 "Engine/Base/Parser.y" { _bExecNextBlock = FALSE; if ((yyvsp[(3) - (4)].val).sttType == STT_INDEX) { @@ -2106,7 +2106,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 39: -#line 529 "./Engine/Base/Parser.y" +#line 529 "Engine/Base/Parser.y" { _bExecNextElse = !(yyvsp[(1) - (6)].ulFlags); _bExecNextBlock = TRUE; @@ -2114,7 +2114,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 42: -#line 538 "./Engine/Base/Parser.y" +#line 538 "Engine/Base/Parser.y" { if (_bExecNextElse) { _bExecNextBlock = FALSE; @@ -2135,7 +2135,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 43: -#line 554 "./Engine/Base/Parser.y" +#line 554 "Engine/Base/Parser.y" { _bExecNextElse = !(yyvsp[(1) - (6)].ulFlags); _bExecNextBlock = TRUE; @@ -2143,21 +2143,21 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 45: -#line 559 "./Engine/Base/Parser.y" +#line 559 "Engine/Base/Parser.y" { _bExecNextBlock = _bExecNextElse; ;} break; case 46: -#line 561 "./Engine/Base/Parser.y" +#line 561 "Engine/Base/Parser.y" { _bExecNextBlock = TRUE; ;} break; case 47: -#line 567 "./Engine/Base/Parser.y" +#line 567 "Engine/Base/Parser.y" { CShellSymbol &ssSymbol = *(yyvsp[(1) - (1)].pssSymbol); const ShellType &stType = _shell_ast[ssSymbol.ss_istType]; @@ -2186,7 +2186,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 48: -#line 592 "./Engine/Base/Parser.y" +#line 592 "Engine/Base/Parser.y" { CShellSymbol &ssSymbol = *(yyvsp[(1) - (4)].pssSymbol); const ShellType &stType = _shell_ast[ssSymbol.ss_istType]; @@ -2227,7 +2227,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 49: -#line 632 "./Engine/Base/Parser.y" +#line 632 "Engine/Base/Parser.y" { (yyval.arg).istType = ShellTypeNewFunction(ShellTypeNewVoid()); ShellTypeAddFunctionArgument((yyval.arg).istType, ShellTypeNewVoid()); @@ -2236,14 +2236,14 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 50: -#line 637 "./Engine/Base/Parser.y" +#line 637 "Engine/Base/Parser.y" { (yyval.arg) = (yyvsp[(1) - (1)].arg); ;} break; case 51: -#line 643 "./Engine/Base/Parser.y" +#line 643 "Engine/Base/Parser.y" { (yyval.arg).istType = ShellTypeNewFunction(ShellTypeNewVoid()); ShellTypeAddFunctionArgument((yyval.arg).istType, ShellTypeNewByType((yyvsp[(1) - (1)].val).sttType)); @@ -2252,7 +2252,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 52: -#line 648 "./Engine/Base/Parser.y" +#line 648 "Engine/Base/Parser.y" { (yyval.arg) = (yyvsp[(1) - (3)].arg); ShellTypeAddFunctionArgument((yyval.arg).istType, ShellTypeNewByType((yyvsp[(3) - (3)].val).sttType)); @@ -2261,7 +2261,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 53: -#line 655 "./Engine/Base/Parser.y" +#line 655 "Engine/Base/Parser.y" { (yyval.val).sttType = STT_FLOAT; (yyval.val).fFloat = (yyvsp[(1) - (1)].val).fFloat; @@ -2269,7 +2269,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 54: -#line 659 "./Engine/Base/Parser.y" +#line 659 "Engine/Base/Parser.y" { (yyval.val).sttType = STT_INDEX; (yyval.val).iIndex = (yyvsp[(1) - (1)].val).iIndex; @@ -2277,7 +2277,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 55: -#line 663 "./Engine/Base/Parser.y" +#line 663 "Engine/Base/Parser.y" { (yyval.val).sttType = STT_STRING; (yyval.val).strString = (yyvsp[(1) - (1)].val).strString; @@ -2285,7 +2285,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 56: -#line 667 "./Engine/Base/Parser.y" +#line 667 "Engine/Base/Parser.y" { // get its value (yyval.val).sttType = (yyvsp[(1) - (1)].lvLValue).lv_sttType; @@ -2306,7 +2306,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 57: -#line 685 "./Engine/Base/Parser.y" +#line 685 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2323,7 +2323,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 58: -#line 698 "./Engine/Base/Parser.y" +#line 698 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2340,7 +2340,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 59: -#line 712 "./Engine/Base/Parser.y" +#line 712 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2358,7 +2358,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 60: -#line 726 "./Engine/Base/Parser.y" +#line 726 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2376,7 +2376,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 61: -#line 740 "./Engine/Base/Parser.y" +#line 740 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2394,7 +2394,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 62: -#line 756 "./Engine/Base/Parser.y" +#line 756 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2412,7 +2412,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 63: -#line 770 "./Engine/Base/Parser.y" +#line 770 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2430,7 +2430,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 64: -#line 785 "./Engine/Base/Parser.y" +#line 785 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2452,7 +2452,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 65: -#line 804 "./Engine/Base/Parser.y" +#line 804 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2470,7 +2470,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 66: -#line 820 "./Engine/Base/Parser.y" +#line 820 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2489,7 +2489,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 67: -#line 836 "./Engine/Base/Parser.y" +#line 836 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2513,7 +2513,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 68: -#line 858 "./Engine/Base/Parser.y" +#line 858 "Engine/Base/Parser.y" { MatchTypes((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); @@ -2531,49 +2531,49 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 69: -#line 874 "./Engine/Base/Parser.y" +#line 874 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '<'); ;} break; case 70: -#line 877 "./Engine/Base/Parser.y" +#line 877 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '>'); ;} break; case 71: -#line 880 "./Engine/Base/Parser.y" +#line 880 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '='); ;} break; case 72: -#line 883 "./Engine/Base/Parser.y" +#line 883 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '!'); ;} break; case 73: -#line 886 "./Engine/Base/Parser.y" +#line 886 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '}'); ;} break; case 74: -#line 889 "./Engine/Base/Parser.y" +#line 889 "Engine/Base/Parser.y" { DoComparison((yyval.val), (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), '{'); ;} break; case 75: -#line 895 "./Engine/Base/Parser.y" +#line 895 "Engine/Base/Parser.y" { (yyval.val).sttType = (yyvsp[(2) - (2)].val).sttType; if ((yyvsp[(2) - (2)].val).sttType == STT_FLOAT) { @@ -2588,7 +2588,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 76: -#line 909 "./Engine/Base/Parser.y" +#line 909 "Engine/Base/Parser.y" { (yyval.val).sttType = (yyvsp[(2) - (2)].val).sttType; if ((yyvsp[(2) - (2)].val).sttType == STT_FLOAT) { @@ -2603,7 +2603,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 77: -#line 921 "./Engine/Base/Parser.y" +#line 921 "Engine/Base/Parser.y" { (yyval.val).sttType = (yyvsp[(2) - (2)].val).sttType; if ((yyvsp[(2) - (2)].val).sttType == STT_FLOAT) { @@ -2619,7 +2619,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 78: -#line 934 "./Engine/Base/Parser.y" +#line 934 "Engine/Base/Parser.y" { (yyval.val).sttType = STT_FLOAT; if ((yyvsp[(4) - (4)].val).sttType == STT_FLOAT) { @@ -2636,7 +2636,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 79: -#line 948 "./Engine/Base/Parser.y" +#line 948 "Engine/Base/Parser.y" { (yyval.val).sttType = STT_INDEX; if ((yyvsp[(4) - (4)].val).sttType == STT_FLOAT) { @@ -2653,7 +2653,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 80: -#line 962 "./Engine/Base/Parser.y" +#line 962 "Engine/Base/Parser.y" { CTString &strNew = _shell_astrTempStrings.Push(); (yyval.val).sttType = STT_STRING; @@ -2672,7 +2672,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 81: -#line 979 "./Engine/Base/Parser.y" +#line 979 "Engine/Base/Parser.y" { // if the identifier is not declared if (!(yyvsp[(1) - (4)].pssSymbol)->IsDeclared()) { @@ -2771,7 +2771,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); break; case 82: -#line 1075 "./Engine/Base/Parser.y" +#line 1075 "Engine/Base/Parser.y" { (yyval.val) = (yyvsp[(2) - (3)].val); ;} @@ -2779,7 +2779,7 @@ extern void PrintShellSymbolHelp(const CTString &strSymbol); /* Line 1267 of yacc.c. */ -#line 2783 "./Engine/Base/Parser.cpp" +#line 2783 "Engine/Base/Parser.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2993,6 +2993,6 @@ yyreturn: } -#line 1080 "./Engine/Base/Parser.y" +#line 1080 "Engine/Base/Parser.y" diff --git a/Sources/Engine/Base/Scanner.cpp b/Sources/Engine/Base/Scanner.cpp index 351245e..7dc9374 100644 --- a/Sources/Engine/Base/Scanner.cpp +++ b/Sources/Engine/Base/Scanner.cpp @@ -1,6 +1,6 @@ -#line 2 "./Engine/Base/Scanner.cpp" +#line 2 "Engine/Base/Scanner.cpp" -#line 4 "./Engine/Base/Scanner.cpp" +#line 4 "Engine/Base/Scanner.cpp" #define YY_INT_ALIGNED short int @@ -587,8 +587,8 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "./Engine/Base/Scanner.l" -#line 2 "./Engine/Base/Scanner.l" +#line 1 "Engine/Base/Scanner.l" +#line 2 "Engine/Base/Scanner.l" #include "ParsingSymbols.h" #include "Parser.h" @@ -651,7 +651,7 @@ void TranscriptEsc(CTString &str) -#line 655 "./Engine/Base/Scanner.cpp" +#line 655 "Engine/Base/Scanner.cpp" #define INITIAL 0 #define COMMENT 1 @@ -837,13 +837,13 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 79 "./Engine/Base/Scanner.l" +#line 79 "Engine/Base/Scanner.l" /*\0 yyterminate();*/ /* Include file parsing. */ -#line 847 "./Engine/Base/Scanner.cpp" +#line 847 "Engine/Base/Scanner.cpp" if ( !(yy_init) ) { @@ -928,18 +928,18 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 84 "./Engine/Base/Scanner.l" +#line 84 "Engine/Base/Scanner.l" BEGIN(INCLUDE); YY_BREAK case 2: YY_RULE_SETUP -#line 86 "./Engine/Base/Scanner.l" +#line 86 "Engine/Base/Scanner.l" /* eat the whitespace until first quote */ YY_BREAK case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 87 "./Engine/Base/Scanner.l" +#line 87 "Engine/Base/Scanner.l" { /* get the include file name until second quote */ if (ShellGetBufferStackDepth() >= SHELL_MAX_INCLUDE_LEVEL) { _pShell->ErrorF("Script files nested too deeply"); @@ -961,7 +961,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 105 "./Engine/Base/Scanner.l" +#line 105 "Engine/Base/Scanner.l" { /* something unrecognized inside include statement */ _pShell->ErrorF("Wrong syntax for include statement"); BEGIN(INITIAL); @@ -971,7 +971,7 @@ YY_RULE_SETUP case 5: /* rule 5 can match eol */ YY_RULE_SETUP -#line 111 "./Engine/Base/Scanner.l" +#line 111 "Engine/Base/Scanner.l" { // for each parameter _ctCmdParam++; CTString strParam = yytext; @@ -999,7 +999,7 @@ YY_RULE_SETUP case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 134 "./Engine/Base/Scanner.l" +#line 134 "Engine/Base/Scanner.l" { // at the end of the command @@ -1013,7 +1013,7 @@ case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(DUMMYBLOCK): case YY_STATE_EOF(INCLUDE): case YY_STATE_EOF(COMMAND): -#line 142 "./Engine/Base/Scanner.l" +#line 142 "Engine/Base/Scanner.l" { if (ShellPopBuffer()) { yyterminate(); @@ -1023,147 +1023,147 @@ case YY_STATE_EOF(COMMAND): /* special data types */ case 7: YY_RULE_SETUP -#line 149 "./Engine/Base/Scanner.l" +#line 149 "Engine/Base/Scanner.l" { return(k_FLOAT);} YY_BREAK case 8: YY_RULE_SETUP -#line 150 "./Engine/Base/Scanner.l" +#line 150 "Engine/Base/Scanner.l" { return(k_INDEX);} YY_BREAK case 9: YY_RULE_SETUP -#line 151 "./Engine/Base/Scanner.l" +#line 151 "Engine/Base/Scanner.l" { return(k_CTString);} YY_BREAK /* keywords */ case 10: YY_RULE_SETUP -#line 154 "./Engine/Base/Scanner.l" +#line 154 "Engine/Base/Scanner.l" { return(k_void); } YY_BREAK case 11: YY_RULE_SETUP -#line 155 "./Engine/Base/Scanner.l" +#line 155 "Engine/Base/Scanner.l" { return(k_const); } YY_BREAK case 12: YY_RULE_SETUP -#line 156 "./Engine/Base/Scanner.l" +#line 156 "Engine/Base/Scanner.l" { return(k_user); } YY_BREAK case 13: YY_RULE_SETUP -#line 157 "./Engine/Base/Scanner.l" +#line 157 "Engine/Base/Scanner.l" { return(k_persistent); } YY_BREAK case 14: YY_RULE_SETUP -#line 158 "./Engine/Base/Scanner.l" +#line 158 "Engine/Base/Scanner.l" { return(k_extern); } YY_BREAK case 15: YY_RULE_SETUP -#line 159 "./Engine/Base/Scanner.l" +#line 159 "Engine/Base/Scanner.l" { return(k_pre); } YY_BREAK case 16: YY_RULE_SETUP -#line 160 "./Engine/Base/Scanner.l" +#line 160 "Engine/Base/Scanner.l" { return(k_post); } YY_BREAK case 17: YY_RULE_SETUP -#line 161 "./Engine/Base/Scanner.l" +#line 161 "Engine/Base/Scanner.l" { return(k_help); } YY_BREAK case 18: YY_RULE_SETUP -#line 162 "./Engine/Base/Scanner.l" +#line 162 "Engine/Base/Scanner.l" { return(k_if); } YY_BREAK case 19: YY_RULE_SETUP -#line 163 "./Engine/Base/Scanner.l" +#line 163 "Engine/Base/Scanner.l" { return(k_else); } YY_BREAK case 20: YY_RULE_SETUP -#line 164 "./Engine/Base/Scanner.l" +#line 164 "Engine/Base/Scanner.l" { return(k_else_if); } YY_BREAK case 21: YY_RULE_SETUP -#line 166 "./Engine/Base/Scanner.l" +#line 166 "Engine/Base/Scanner.l" { return (LEQ); } YY_BREAK case 22: YY_RULE_SETUP -#line 167 "./Engine/Base/Scanner.l" +#line 167 "Engine/Base/Scanner.l" { return (GEQ); } YY_BREAK case 23: YY_RULE_SETUP -#line 168 "./Engine/Base/Scanner.l" +#line 168 "Engine/Base/Scanner.l" { return (EQ); } YY_BREAK case 24: YY_RULE_SETUP -#line 169 "./Engine/Base/Scanner.l" +#line 169 "Engine/Base/Scanner.l" { return (NEQ); } YY_BREAK case 25: YY_RULE_SETUP -#line 171 "./Engine/Base/Scanner.l" +#line 171 "Engine/Base/Scanner.l" { return (SHR); } YY_BREAK case 26: YY_RULE_SETUP -#line 172 "./Engine/Base/Scanner.l" +#line 172 "Engine/Base/Scanner.l" { return (SHL); } YY_BREAK case 27: YY_RULE_SETUP -#line 174 "./Engine/Base/Scanner.l" +#line 174 "Engine/Base/Scanner.l" { return (LOGAND); } YY_BREAK case 28: YY_RULE_SETUP -#line 175 "./Engine/Base/Scanner.l" +#line 175 "Engine/Base/Scanner.l" { return (LOGOR); } YY_BREAK /* single character operators and punctuations */ case 29: YY_RULE_SETUP -#line 178 "./Engine/Base/Scanner.l" +#line 178 "Engine/Base/Scanner.l" { return(yytext[0]);} YY_BREAK /* constants */ case 30: YY_RULE_SETUP -#line 182 "./Engine/Base/Scanner.l" +#line 182 "Engine/Base/Scanner.l" { yylval.val.iIndex = atoi(yytext); return(c_int); } YY_BREAK case 31: YY_RULE_SETUP -#line 183 "./Engine/Base/Scanner.l" +#line 183 "Engine/Base/Scanner.l" { yylval.val.iIndex = strtoul(yytext+2, NULL, 16); return(c_int); } YY_BREAK case 32: YY_RULE_SETUP -#line 184 "./Engine/Base/Scanner.l" +#line 184 "Engine/Base/Scanner.l" { yylval.val.fFloat = (float) atof(yytext); return(c_float); } YY_BREAK case 33: YY_RULE_SETUP -#line 185 "./Engine/Base/Scanner.l" +#line 185 "Engine/Base/Scanner.l" { yylval.val.fFloat = (float) atof(yytext); return(c_float); } YY_BREAK case 34: /* rule 34 can match eol */ YY_RULE_SETUP -#line 186 "./Engine/Base/Scanner.l" +#line 186 "Engine/Base/Scanner.l" { CTString &strNew = _shell_astrTempStrings.Push(); // remove double-quotes @@ -1177,13 +1177,13 @@ YY_RULE_SETUP case 35: /* rule 35 can match eol */ YY_RULE_SETUP -#line 195 "./Engine/Base/Scanner.l" +#line 195 "Engine/Base/Scanner.l" { return(c_char); } YY_BREAK /* identifier */ case 36: YY_RULE_SETUP -#line 198 "./Engine/Base/Scanner.l" +#line 198 "Engine/Base/Scanner.l" { // get the symbol yylval.pssSymbol = _pShell->GetSymbol(yytext, FALSE); @@ -1210,7 +1210,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 221 "./Engine/Base/Scanner.l" +#line 221 "Engine/Base/Scanner.l" { // special case of identifier, used to bypass command parsing // get the symbol yylval.pssSymbol = _pShell->GetSymbol(yytext+1, FALSE); @@ -1220,7 +1220,7 @@ YY_RULE_SETUP /* eat up or execute blocks */ case 38: YY_RULE_SETUP -#line 228 "./Engine/Base/Scanner.l" +#line 228 "Engine/Base/Scanner.l" { _iBlockDepth++; if (!_bExecNextBlock) { @@ -1232,7 +1232,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 237 "./Engine/Base/Scanner.l" +#line 237 "Engine/Base/Scanner.l" { _iBlockDepth--; if (_iBlockDepth<0) { @@ -1243,7 +1243,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 244 "./Engine/Base/Scanner.l" +#line 244 "Engine/Base/Scanner.l" { _iBlockDepth++; _iDummyDepth++; @@ -1251,7 +1251,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 248 "./Engine/Base/Scanner.l" +#line 248 "Engine/Base/Scanner.l" { _iBlockDepth--; _iDummyDepth--; @@ -1263,35 +1263,35 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 256 "./Engine/Base/Scanner.l" +#line 256 "Engine/Base/Scanner.l" {} YY_BREAK /* eat up comments */ case 43: YY_RULE_SETUP -#line 259 "./Engine/Base/Scanner.l" +#line 259 "Engine/Base/Scanner.l" { BEGIN(COMMENT); } YY_BREAK case 44: YY_RULE_SETUP -#line 260 "./Engine/Base/Scanner.l" +#line 260 "Engine/Base/Scanner.l" { BEGIN(INITIAL); } YY_BREAK case 45: YY_RULE_SETUP -#line 261 "./Engine/Base/Scanner.l" +#line 261 "Engine/Base/Scanner.l" {} YY_BREAK case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 262 "./Engine/Base/Scanner.l" +#line 262 "Engine/Base/Scanner.l" { ShellCountOneLine(); } YY_BREAK /* eat up whitespace */ case 47: YY_RULE_SETUP -#line 266 "./Engine/Base/Scanner.l" +#line 266 "Engine/Base/Scanner.l" { } YY_BREAK @@ -1299,7 +1299,7 @@ YY_RULE_SETUP case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 269 "./Engine/Base/Scanner.l" +#line 269 "Engine/Base/Scanner.l" { ShellCountOneLine(); } @@ -1307,7 +1307,7 @@ YY_RULE_SETUP /* for all unrecognized characters */ case 49: YY_RULE_SETUP -#line 274 "./Engine/Base/Scanner.l" +#line 274 "Engine/Base/Scanner.l" { // report an error _pShell->ErrorF("Unrecognized character '%c' (ASCII 0x%02x)", yytext[0], yytext[0] ); @@ -1315,10 +1315,10 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 279 "./Engine/Base/Scanner.l" +#line 279 "Engine/Base/Scanner.l" ECHO; YY_BREAK -#line 1322 "./Engine/Base/Scanner.cpp" +#line 1322 "Engine/Base/Scanner.cpp" case YY_END_OF_BUFFER: { @@ -2313,7 +2313,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 279 "./Engine/Base/Scanner.l" +#line 279 "Engine/Base/Scanner.l" diff --git a/Sources/Engine/Base/parser.h b/Sources/Engine/Base/parser.h index 557c0d6..6665461 100644 --- a/Sources/Engine/Base/parser.h +++ b/Sources/Engine/Base/parser.h @@ -110,7 +110,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 197 "./Engine/Base/Parser.y" +#line 197 "Engine/Base/Parser.y" { value val; // for constants and expressions arguments arg; // for function input arguments @@ -122,7 +122,7 @@ typedef union YYSTYPE void (*pPostFunc)(INDEX); // post-set function for a variable } /* Line 1529 of yacc.c. */ -#line 126 "./Engine/Base/Parser.hpp" +#line 126 "Engine/Base/Parser.hpp" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1