diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 389ab52ab..2d277578a 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs @@ -2,7 +2,7 @@ // This CSharp output file generated by Gardens Point LEX // Version: 1.1.3.301 // Machine: DESKTOP-8EAQPI9 -// DateTime: 20.06.2017 20:13:30 +// DateTime: 08.06.2017 12:30:07 // UserName: ????????? // GPLEX input file // GPLEX frame file @@ -1940,7 +1940,6 @@ string cur_yytext = yytext; case (int)Tokens.tkSealed: case (int)Tokens.tkPartial: case (int)Tokens.tkParams: - case (int)Tokens.tkStep: case (int)Tokens.tkTo: case (int)Tokens.tkDownto: case (int)Tokens.tkUnit: diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex index 282c0e3d9..9a7e74f1a 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex @@ -345,7 +345,6 @@ UNICODEARROW \x890 case (int)Tokens.tkSealed: case (int)Tokens.tkPartial: case (int)Tokens.tkParams: - case (int)Tokens.tkStep: case (int)Tokens.tkTo: case (int)Tokens.tkDownto: case (int)Tokens.tkUnit: diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y index 25390924f..1c39c8fc3 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y @@ -34,7 +34,7 @@ %token tkDirectiveName tkAmpersend tkColon tkDotDot tkPoint tkRoundOpen tkRoundClose tkSemiColon tkSquareOpen tkSquareClose tkQuestion tkQuestionPoint tkDoubleQuestion tkQuestionSquareOpen %token tkSizeOf tkTypeOf tkWhere tkArray tkCase tkClass tkAuto tkConst tkConstructor tkDestructor tkElse tkExcept tkFile tkFor tkForeach tkFunction %token tkIf tkImplementation tkInherited tkInterface tkProcedure tkOperator tkProperty tkRaise tkRecord tkSet tkType tkThen tkUses tkVar tkWhile tkWith tkNil -%token tkGoto tkOf tkLabel tkLock tkProgram tkEvent tkDefault tkTemplate tkPacked tkExports tkResourceString tkThreadvar tkSealed tkPartial tkTo tkDownto tkStep +%token tkGoto tkOf tkLabel tkLock tkProgram tkEvent tkDefault tkTemplate tkPacked tkExports tkResourceString tkThreadvar tkSealed tkPartial tkTo tkDownto %token tkLoop %token tkSequence tkYield %token tkNew @@ -2528,11 +2528,7 @@ foreach_stmt_ident_dype_opt for_stmt : tkFor optional_var identifier for_stmt_decl_or_assign expr_l1 for_cycle_type expr_l1 optional_tk_do unlabelled_stmt { - $$ = NewForStmt((bool)$2, $3, $4, $5, (for_cycle_type)$6, $7, null, $8, $9 as statement, @$); - } - | tkFor optional_var identifier for_stmt_decl_or_assign expr_l1 for_cycle_type expr_l1 tkStep expr_l1 optional_tk_do unlabelled_stmt - { - $$ = NewForStmt((bool)$2, $3, $4, $5, (for_cycle_type)$6, $7, $9, $10, $11 as statement, @$); + $$ = NewForStmt((bool)$2, $3, $4, $5, (for_cycle_type)$6, $7, $8, $9 as statement, @$); } ; diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 11126a49e..cb4be32c0 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,7 +2,7 @@ // GPPG version 1.3.6 // Machine: DESKTOP-8EAQPI9 -// DateTime: 20.06.2017 20:13:30 +// DateTime: 08.06.2017 12:30:08 // UserName: ????????? // Input file @@ -32,20 +32,20 @@ public enum Tokens { tkType=43,tkThen=44,tkUses=45,tkVar=46,tkWhile=47,tkWith=48, tkNil=49,tkGoto=50,tkOf=51,tkLabel=52,tkLock=53,tkProgram=54, tkEvent=55,tkDefault=56,tkTemplate=57,tkPacked=58,tkExports=59,tkResourceString=60, - tkThreadvar=61,tkSealed=62,tkPartial=63,tkTo=64,tkDownto=65,tkStep=66, - tkLoop=67,tkSequence=68,tkYield=69,tkNew=70,tkOn=71,tkName=72, - tkPrivate=73,tkProtected=74,tkPublic=75,tkInternal=76,tkRead=77,tkWrite=78, - tkParseModeExpression=79,tkParseModeStatement=80,tkParseModeType=81,tkBegin=82,tkEnd=83,tkAsmBody=84, - tkILCode=85,tkError=86,INVISIBLE=87,tkRepeat=88,tkUntil=89,tkDo=90, - tkComma=91,tkFinally=92,tkTry=93,tkInitialization=94,tkFinalization=95,tkUnit=96, - tkLibrary=97,tkExternal=98,tkParams=99,tkAssign=100,tkPlusEqual=101,tkMinusEqual=102, - tkMultEqual=103,tkDivEqual=104,tkMinus=105,tkPlus=106,tkSlash=107,tkStar=108, - tkEqual=109,tkGreater=110,tkGreaterEqual=111,tkLower=112,tkLowerEqual=113,tkNotEqual=114, - tkCSharpStyleOr=115,tkArrow=116,tkOr=117,tkXor=118,tkAnd=119,tkDiv=120, - tkMod=121,tkShl=122,tkShr=123,tkNot=124,tkAs=125,tkIn=126, - tkIs=127,tkImplicit=128,tkExplicit=129,tkAddressOf=130,tkDeref=131,tkIdentifier=132, - tkStringLiteral=133,tkAsciiChar=134,tkAbstract=135,tkForward=136,tkOverload=137,tkReintroduce=138, - tkOverride=139,tkVirtual=140,tkExtensionMethod=141,tkInteger=142,tkFloat=143,tkHex=144}; + tkThreadvar=61,tkSealed=62,tkPartial=63,tkTo=64,tkDownto=65,tkLoop=66, + tkSequence=67,tkYield=68,tkNew=69,tkOn=70,tkName=71,tkPrivate=72, + tkProtected=73,tkPublic=74,tkInternal=75,tkRead=76,tkWrite=77,tkParseModeExpression=78, + tkParseModeStatement=79,tkParseModeType=80,tkBegin=81,tkEnd=82,tkAsmBody=83,tkILCode=84, + tkError=85,INVISIBLE=86,tkRepeat=87,tkUntil=88,tkDo=89,tkComma=90, + tkFinally=91,tkTry=92,tkInitialization=93,tkFinalization=94,tkUnit=95,tkLibrary=96, + tkExternal=97,tkParams=98,tkAssign=99,tkPlusEqual=100,tkMinusEqual=101,tkMultEqual=102, + tkDivEqual=103,tkMinus=104,tkPlus=105,tkSlash=106,tkStar=107,tkEqual=108, + tkGreater=109,tkGreaterEqual=110,tkLower=111,tkLowerEqual=112,tkNotEqual=113,tkCSharpStyleOr=114, + tkArrow=115,tkOr=116,tkXor=117,tkAnd=118,tkDiv=119,tkMod=120, + tkShl=121,tkShr=122,tkNot=123,tkAs=124,tkIn=125,tkIs=126, + tkImplicit=127,tkExplicit=128,tkAddressOf=129,tkDeref=130,tkIdentifier=131,tkStringLiteral=132, + tkAsciiChar=133,tkAbstract=134,tkForward=135,tkOverload=136,tkReintroduce=137,tkOverride=138, + tkVirtual=139,tkExtensionMethod=140,tkInteger=141,tkFloat=142,tkHex=143}; // Abstract base class for GPLEX scanners public abstract class ScanBase : AbstractScanner { @@ -73,8 +73,8 @@ public partial class GPPGParser: ShiftReduceParser aliasses; #pragma warning restore 649 - private static Rule[] rules = new Rule[828]; - private static State[] states = new State[1336]; + private static Rule[] rules = new Rule[827]; + private static State[] states = new State[1332]; private static string[] nonTerms = new string[] { "parse_goal", "unit_key_word", "assignment", "optional_array_initializer", "attribute_declarations", "ot_visibility_specifier", "one_attribute", "attribute_variable", @@ -153,212 +153,212 @@ public partial class GPPGParser: ShiftReduceParser tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, // for_cycle_type, expr_l1, optional_tk_do, unlabelled_stmt { - CurrentSemanticValue.stn = NewForStmt((bool)ValueStack[ValueStack.Depth-8].ob, ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-6].td, ValueStack[ValueStack.Depth-5].ex, (for_cycle_type)ValueStack[ValueStack.Depth-4].ob, ValueStack[ValueStack.Depth-3].ex, null, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); + CurrentSemanticValue.stn = NewForStmt((bool)ValueStack[ValueStack.Depth-8].ob, ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-6].td, ValueStack[ValueStack.Depth-5].ex, (for_cycle_type)ValueStack[ValueStack.Depth-4].ob, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 510: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, - // for_cycle_type, expr_l1, tkStep, expr_l1, optional_tk_do, - // unlabelled_stmt -{ - CurrentSemanticValue.stn = NewForStmt((bool)ValueStack[ValueStack.Depth-10].ob, ValueStack[ValueStack.Depth-9].id, ValueStack[ValueStack.Depth-8].td, ValueStack[ValueStack.Depth-7].ex, (for_cycle_type)ValueStack[ValueStack.Depth-6].ob, ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); - } - break; - case 511: // optional_var -> tkVar + case 510: // optional_var -> tkVar { CurrentSemanticValue.ob = true; } break; - case 512: // optional_var -> /* empty */ + case 511: // optional_var -> /* empty */ { CurrentSemanticValue.ob = false; } break; - case 514: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign + case 513: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-2].td; } break; - case 515: // for_cycle_type -> tkTo + case 514: // for_cycle_type -> tkTo { CurrentSemanticValue.ob = for_cycle_type.to; } break; - case 516: // for_cycle_type -> tkDownto + case 515: // for_cycle_type -> tkDownto { CurrentSemanticValue.ob = for_cycle_type.downto; } break; - case 517: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt + case 516: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new with_statement(ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].stn as expression_list, CurrentLocationSpan); } break; - case 518: // inherited_message -> tkInherited + case 517: // inherited_message -> tkInherited { CurrentSemanticValue.stn = new inherited_message(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 519: // try_stmt -> tkTry, stmt_list, try_handler + case 518: // try_stmt -> tkTry, stmt_list, try_handler { CurrentSemanticValue.stn = new try_stmt(ValueStack[ValueStack.Depth-2].stn as statement_list, ValueStack[ValueStack.Depth-1].stn as try_handler, CurrentLocationSpan); (ValueStack[ValueStack.Depth-2].stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-3].ti; ValueStack[ValueStack.Depth-2].stn.source_context = LocationStack[LocationStack.Depth-3].Merge(LocationStack[LocationStack.Depth-2]); } break; - case 520: // try_handler -> tkFinally, stmt_list, tkEnd + case 519: // try_handler -> tkFinally, stmt_list, tkEnd { CurrentSemanticValue.stn = new try_handler_finally(ValueStack[ValueStack.Depth-2].stn as statement_list, CurrentLocationSpan); (ValueStack[ValueStack.Depth-2].stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-3].ti; (ValueStack[ValueStack.Depth-2].stn as statement_list).right_logical_bracket = ValueStack[ValueStack.Depth-1].ti; } break; - case 521: // try_handler -> tkExcept, exception_block, tkEnd + case 520: // try_handler -> tkExcept, exception_block, tkEnd { CurrentSemanticValue.stn = new try_handler_except((exception_block)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); if ((ValueStack[ValueStack.Depth-2].stn as exception_block).stmt_list != null) @@ -4620,160 +4608,160 @@ public partial class GPPGParser: ShiftReduceParser exception_handler_list, exception_block_else_branch + case 521: // exception_block -> exception_handler_list, exception_block_else_branch { CurrentSemanticValue.stn = new exception_block(null, (exception_handler_list)ValueStack[ValueStack.Depth-2].stn, (statement_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 523: // exception_block -> exception_handler_list, tkSemiColon, + case 522: // exception_block -> exception_handler_list, tkSemiColon, // exception_block_else_branch { CurrentSemanticValue.stn = new exception_block(null, (exception_handler_list)ValueStack[ValueStack.Depth-3].stn, (statement_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 524: // exception_block -> stmt_list + case 523: // exception_block -> stmt_list { CurrentSemanticValue.stn = new exception_block(ValueStack[ValueStack.Depth-1].stn as statement_list, null, null, LocationStack[LocationStack.Depth-1]); } break; - case 525: // exception_handler_list -> exception_handler + case 524: // exception_handler_list -> exception_handler { CurrentSemanticValue.stn = new exception_handler_list(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 526: // exception_handler_list -> exception_handler_list, tkSemiColon, + case 525: // exception_handler_list -> exception_handler_list, tkSemiColon, // exception_handler { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as exception_handler_list).Add(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 527: // exception_block_else_branch -> /* empty */ + case 526: // exception_block_else_branch -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 528: // exception_block_else_branch -> tkElse, stmt_list + case 527: // exception_block_else_branch -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 529: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt + case 528: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new exception_handler((ValueStack[ValueStack.Depth-3].stn as exception_ident).variable, (ValueStack[ValueStack.Depth-3].stn as exception_ident).type_name, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 530: // exception_identifier -> exception_class_type_identifier + case 529: // exception_identifier -> exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(null, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 531: // exception_identifier -> exception_variable, tkColon, + case 530: // exception_identifier -> exception_variable, tkColon, // exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(ValueStack[ValueStack.Depth-3].id, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 532: // exception_class_type_identifier -> simple_type_identifier + case 531: // exception_class_type_identifier -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 533: // exception_variable -> identifier + case 532: // exception_variable -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 534: // raise_stmt -> tkRaise + case 533: // raise_stmt -> tkRaise { CurrentSemanticValue.stn = new raise_stmt(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 535: // raise_stmt -> tkRaise, expr + case 534: // raise_stmt -> tkRaise, expr { CurrentSemanticValue.stn = new raise_stmt(ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 536: // expr_list -> expr_with_func_decl_lambda + case 535: // expr_list -> expr_with_func_decl_lambda { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 537: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda + case 536: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 538: // expr_as_stmt -> allowable_expr_as_stmt + case 537: // expr_as_stmt -> allowable_expr_as_stmt { CurrentSemanticValue.stn = new expression_as_statement(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 539: // allowable_expr_as_stmt -> new_expr + case 538: // allowable_expr_as_stmt -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 540: // expr_with_func_decl_lambda -> expr + case 539: // expr_with_func_decl_lambda -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 541: // expr_with_func_decl_lambda -> func_decl_lambda + case 540: // expr_with_func_decl_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 542: // expr -> expr_l1 + case 541: // expr -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 543: // expr -> format_expr + case 542: // expr -> format_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 544: // expr_l1 -> double_question_expr + case 543: // expr_l1 -> double_question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 545: // expr_l1 -> question_expr + case 544: // expr_l1 -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 546: // double_question_expr -> relop_expr + case 545: // double_question_expr -> relop_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 547: // double_question_expr -> double_question_expr, tkDoubleQuestion, relop_expr + case 546: // double_question_expr -> double_question_expr, tkDoubleQuestion, relop_expr { CurrentSemanticValue.ex = new double_question_node(ValueStack[ValueStack.Depth-3].ex as expression, ValueStack[ValueStack.Depth-1].ex as expression, CurrentLocationSpan);} break; - case 548: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, + case 547: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new sizeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, null, CurrentLocationSpan); } break; - case 549: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, + case 548: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new typeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 550: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 + case 549: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 { CurrentSemanticValue.ex = new question_colon_expression(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 551: // simple_or_template_type_reference -> simple_type_identifier + case 550: // simple_or_template_type_reference -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 552: // simple_or_template_type_reference -> simple_type_identifier, + case 551: // simple_or_template_type_reference -> simple_type_identifier, // template_type_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-2].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 553: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, + case 552: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, // template_type_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-3].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 554: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose + case 553: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose { CurrentSemanticValue.stn = new array_const((expression_list)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); } break; - case 556: // new_expr -> tkNew, simple_or_template_type_reference, + case 555: // new_expr -> tkNew, simple_or_template_type_reference, // optional_expr_list_with_bracket { CurrentSemanticValue.ex = new new_expr(ValueStack[ValueStack.Depth-2].td, ValueStack[ValueStack.Depth-1].stn as expression_list, false, null, CurrentLocationSpan); } break; - case 557: // new_expr -> tkNew, array_name_for_new_expr, tkSquareOpen, optional_expr_list, + case 556: // new_expr -> tkNew, array_name_for_new_expr, tkSquareOpen, optional_expr_list, // tkSquareClose, optional_array_initializer { var el = ValueStack[ValueStack.Depth-3].stn as expression_list; @@ -4789,7 +4777,7 @@ public partial class GPPGParser: ShiftReduceParser tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, + case 557: // new_expr -> tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, // tkRoundClose { // sugared node @@ -4804,12 +4792,12 @@ public partial class GPPGParser: ShiftReduceParser identifier, tkAssign, relop_expr + case 558: // field_in_unnamed_object -> identifier, tkAssign, relop_expr { CurrentSemanticValue.ob = new name_assign_expr(ValueStack[ValueStack.Depth-3].id,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); } break; - case 560: // field_in_unnamed_object -> relop_expr + case 559: // field_in_unnamed_object -> relop_expr { ident name = null; var id = ValueStack[ValueStack.Depth-1].ex as ident; @@ -4829,13 +4817,13 @@ public partial class GPPGParser: ShiftReduceParser field_in_unnamed_object + case 560: // list_fields_in_unnamed_object -> field_in_unnamed_object { var l = new name_assign_expr_list(); CurrentSemanticValue.ob = l.Add(ValueStack[ValueStack.Depth-1].ob as name_assign_expr); } break; - case 562: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, + case 561: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, // field_in_unnamed_object { var nel = ValueStack[ValueStack.Depth-3].ob as name_assign_expr_list; @@ -4846,157 +4834,157 @@ public partial class GPPGParser: ShiftReduceParser simple_type_identifier + case 562: // array_name_for_new_expr -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 564: // array_name_for_new_expr -> unsized_array_type + case 563: // array_name_for_new_expr -> unsized_array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 565: // optional_expr_list_with_bracket -> /* empty */ + case 564: // optional_expr_list_with_bracket -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 566: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, + case 565: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, // tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 567: // relop_expr -> simple_expr + case 566: // relop_expr -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 568: // relop_expr -> relop_expr, relop, simple_expr + case 567: // relop_expr -> relop_expr, relop, simple_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 569: // simple_expr_or_nothing -> simple_expr + case 568: // simple_expr_or_nothing -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 570: // simple_expr_or_nothing -> /* empty */ + case 569: // simple_expr_or_nothing -> /* empty */ { CurrentSemanticValue.ex = new int32_const(int.MaxValue); } break; - case 571: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing + case 570: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 572: // format_expr -> tkColon, simple_expr_or_nothing + case 571: // format_expr -> tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue), ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 573: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, + case 572: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, // simple_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 574: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr + case 573: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr { CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue), ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 575: // relop -> tkEqual + case 574: // relop -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 576: // relop -> tkNotEqual + case 575: // relop -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 577: // relop -> tkLower + case 576: // relop -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 578: // relop -> tkGreater + case 577: // relop -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 579: // relop -> tkLowerEqual + case 578: // relop -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 580: // relop -> tkGreaterEqual + case 579: // relop -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 581: // relop -> tkIn + case 580: // relop -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 582: // simple_expr -> term + case 581: // simple_expr -> term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 583: // simple_expr -> simple_expr, addop, term + case 582: // simple_expr -> simple_expr, addop, term { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 584: // addop -> tkPlus + case 583: // addop -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 585: // addop -> tkMinus + case 584: // addop -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 586: // addop -> tkOr + case 585: // addop -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 587: // addop -> tkXor + case 586: // addop -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 588: // addop -> tkCSharpStyleOr + case 587: // addop -> tkCSharpStyleOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 589: // typecast_op -> tkAs + case 588: // typecast_op -> tkAs { CurrentSemanticValue.ob = op_typecast.as_op; } break; - case 590: // typecast_op -> tkIs + case 589: // typecast_op -> tkIs { CurrentSemanticValue.ob = op_typecast.is_op; } break; - case 591: // as_is_expr -> term, typecast_op, simple_or_template_type_reference + case 590: // as_is_expr -> term, typecast_op, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, (op_typecast)ValueStack[ValueStack.Depth-2].ob, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 592: // term -> factor + case 591: // term -> factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 593: // term -> new_expr + case 592: // term -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 594: // term -> term, mulop, factor + case 593: // term -> term, mulop, factor { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 595: // term -> as_is_expr + case 594: // term -> as_is_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 596: // mulop -> tkStar + case 595: // mulop -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 597: // mulop -> tkSlash + case 596: // mulop -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 598: // mulop -> tkDiv + case 597: // mulop -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 599: // mulop -> tkMod + case 598: // mulop -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 600: // mulop -> tkShl + case 599: // mulop -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 601: // mulop -> tkShr + case 600: // mulop -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 602: // mulop -> tkAnd + case 601: // mulop -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 603: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, + case 602: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new default_operator(ValueStack[ValueStack.Depth-2].td as named_type_reference, CurrentLocationSpan); } break; - case 604: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, + case 603: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, // optional_full_lambda_fp_list, tkRoundClose { /*if ($5 != null) @@ -5010,112 +4998,112 @@ public partial class GPPGParser: ShiftReduceParser tkNil + case 604: // factor -> tkNil { CurrentSemanticValue.ex = new nil_const(); CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 606: // factor -> literal_or_number + case 605: // factor -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 607: // factor -> default_expr + case 606: // factor -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 608: // factor -> tkSquareOpen, elem_list, tkSquareClose + case 607: // factor -> tkSquareOpen, elem_list, tkSquareClose { CurrentSemanticValue.ex = new pascal_set_constant(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 609: // factor -> tkNot, factor + case 608: // factor -> tkNot, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 610: // factor -> sign, factor + case 609: // factor -> sign, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 611: // factor -> tkDeref, factor + case 610: // factor -> tkDeref, factor { CurrentSemanticValue.ex = new roof_dereference(ValueStack[ValueStack.Depth-1].ex as addressed_value, CurrentLocationSpan); } break; - case 612: // factor -> var_reference + case 611: // factor -> var_reference { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 613: // factor -> tuple + case 612: // factor -> tuple { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 614: // literal_or_number -> literal + case 613: // literal_or_number -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 615: // literal_or_number -> unsigned_number + case 614: // literal_or_number -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 616: // var_question_point -> variable, tkQuestionPoint, variable + case 615: // var_question_point -> variable, tkQuestionPoint, variable { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 617: // var_question_point -> variable, tkQuestionPoint, var_question_point + case 616: // var_question_point -> variable, tkQuestionPoint, var_question_point { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 618: // var_reference -> var_address, variable + case 617: // var_reference -> var_address, variable { CurrentSemanticValue.ex = NewVarReference(ValueStack[ValueStack.Depth-2].stn as get_address, ValueStack[ValueStack.Depth-1].ex as addressed_value, CurrentLocationSpan); } break; - case 619: // var_reference -> variable + case 618: // var_reference -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 620: // var_reference -> var_question_point + case 619: // var_reference -> var_question_point { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 621: // var_address -> tkAddressOf + case 620: // var_address -> tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(CurrentLocationSpan); } break; - case 622: // var_address -> var_address, tkAddressOf + case 621: // var_address -> var_address, tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(ValueStack[ValueStack.Depth-2].stn as get_address, CurrentLocationSpan); } break; - case 623: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket + case 622: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket { CurrentSemanticValue.stn = new attribute(null, ValueStack[ValueStack.Depth-2].td as named_type_reference, ValueStack[ValueStack.Depth-1].stn as expression_list, CurrentLocationSpan); } break; - case 624: // dotted_identifier -> identifier + case 623: // dotted_identifier -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 625: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword + case 624: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 626: // variable_as_type -> dotted_identifier + case 625: // variable_as_type -> dotted_identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex;} break; - case 627: // variable_as_type -> dotted_identifier, template_type_params + case 626: // variable_as_type -> dotted_identifier, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(ValueStack[ValueStack.Depth-2].ex as addressed_value, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 628: // variable -> identifier + case 627: // variable -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 629: // variable -> operator_name_ident + case 628: // variable -> operator_name_ident { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 630: // variable -> tkInherited, identifier + case 629: // variable -> tkInherited, identifier { CurrentSemanticValue.ex = new inherited_ident(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 631: // variable -> tkRoundOpen, expr, tkRoundClose + case 630: // variable -> tkRoundOpen, expr, tkRoundClose { if (!parsertools.build_tree_for_formatter) { @@ -5125,18 +5113,18 @@ public partial class GPPGParser: ShiftReduceParser sizeof_expr + case 631: // variable -> sizeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 633: // variable -> typeof_expr + case 632: // variable -> typeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 634: // variable -> literal_or_number, tkPoint, identifier_or_keyword + case 633: // variable -> literal_or_number, tkPoint, identifier_or_keyword { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 635: // variable -> variable, tkSquareOpen, expr_list, tkSquareClose + case 634: // variable -> variable, tkSquareOpen, expr_list, tkSquareClose { var el = ValueStack[ValueStack.Depth-2].stn as expression_list; // SSM 10/03/16 if (el.Count==1 && el.expressions[0] is format_expr) @@ -5147,502 +5135,502 @@ public partial class GPPGParser: ShiftReduceParser variable, tkQuestionSquareOpen, format_expr, tkSquareClose + case 635: // variable -> variable, tkQuestionSquareOpen, format_expr, tkSquareClose { var fe = ValueStack[ValueStack.Depth-2].ex as format_expr; // SSM 9/01/17 CurrentSemanticValue.ex = new slice_expr_question(ValueStack[ValueStack.Depth-4].ex as addressed_value,fe.expr,fe.format1,fe.format2,CurrentLocationSpan); } break; - case 637: // variable -> variable, tkRoundOpen, optional_expr_list, tkRoundClose + case 636: // variable -> variable, tkRoundOpen, optional_expr_list, tkRoundClose { CurrentSemanticValue.ex = new method_call(ValueStack[ValueStack.Depth-4].ex as addressed_value,ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 638: // variable -> variable, tkPoint, identifier_keyword_operatorname + case 637: // variable -> variable, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 639: // variable -> tuple, tkPoint, identifier_keyword_operatorname + case 638: // variable -> tuple, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 640: // variable -> variable, tkDeref + case 639: // variable -> variable, tkDeref { CurrentSemanticValue.ex = new roof_dereference(ValueStack[ValueStack.Depth-2].ex as addressed_value,CurrentLocationSpan); } break; - case 641: // variable -> variable, tkAmpersend, template_type_params + case 640: // variable -> variable, tkAmpersend, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 642: // optional_expr_list -> expr_list + case 641: // optional_expr_list -> expr_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 643: // optional_expr_list -> /* empty */ + case 642: // optional_expr_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 644: // elem_list -> elem_list1 + case 643: // elem_list -> elem_list1 { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 645: // elem_list -> /* empty */ + case 644: // elem_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 646: // elem_list1 -> elem + case 645: // elem_list1 -> elem { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 647: // elem_list1 -> elem_list1, tkComma, elem + case 646: // elem_list1 -> elem_list1, tkComma, elem { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 648: // elem -> expr + case 647: // elem -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 649: // elem -> expr, tkDotDot, expr + case 648: // elem -> expr, tkDotDot, expr { CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 650: // one_literal -> tkStringLiteral + case 649: // one_literal -> tkStringLiteral { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 651: // one_literal -> tkAsciiChar + case 650: // one_literal -> tkAsciiChar { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 652: // literal -> literal_list + case 651: // literal -> literal_list { CurrentSemanticValue.ex = NewLiteral(ValueStack[ValueStack.Depth-1].stn as literal_const_line); } break; - case 653: // literal_list -> one_literal + case 652: // literal_list -> one_literal { CurrentSemanticValue.stn = new literal_const_line(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 654: // literal_list -> literal_list, one_literal + case 653: // literal_list -> literal_list, one_literal { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-2].stn as literal_const_line).Add(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 655: // operator_name_ident -> tkOperator, overload_operator + case 654: // operator_name_ident -> tkOperator, overload_operator { CurrentSemanticValue.ex = new operator_name_ident((ValueStack[ValueStack.Depth-1].op as op_type_node).text, (ValueStack[ValueStack.Depth-1].op as op_type_node).type, CurrentLocationSpan); } break; - case 656: // optional_method_modificators -> tkSemiColon + case 655: // optional_method_modificators -> tkSemiColon { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 657: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon + case 656: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 658: // optional_method_modificators1 -> /* empty */ + case 657: // optional_method_modificators1 -> /* empty */ { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 659: // optional_method_modificators1 -> tkSemiColon, meth_modificators + case 658: // optional_method_modificators1 -> tkSemiColon, meth_modificators { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 660: // meth_modificators -> meth_modificator + case 659: // meth_modificators -> meth_modificator { CurrentSemanticValue.stn = new procedure_attributes_list(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 661: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator + case 660: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as procedure_attributes_list).Add(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 662: // identifier -> tkIdentifier + case 661: // identifier -> tkIdentifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 663: // identifier -> property_specifier_directives + case 662: // identifier -> property_specifier_directives { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 664: // identifier -> non_reserved + case 663: // identifier -> non_reserved { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 665: // identifier_or_keyword -> identifier + case 664: // identifier_or_keyword -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 666: // identifier_or_keyword -> keyword + case 665: // identifier_or_keyword -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 667: // identifier_or_keyword -> reserved_keyword + case 666: // identifier_or_keyword -> reserved_keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 668: // identifier_keyword_operatorname -> identifier + case 667: // identifier_keyword_operatorname -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 669: // identifier_keyword_operatorname -> keyword + case 668: // identifier_keyword_operatorname -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 670: // identifier_keyword_operatorname -> operator_name_ident + case 669: // identifier_keyword_operatorname -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 671: // meth_modificator -> tkAbstract + case 670: // meth_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 672: // meth_modificator -> tkOverload + case 671: // meth_modificator -> tkOverload { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; parsertools.AddWarningFromResource("OVERLOAD_IS_NOT_USED", ValueStack[ValueStack.Depth-1].id.source_context); } break; - case 673: // meth_modificator -> tkReintroduce + case 672: // meth_modificator -> tkReintroduce { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 674: // meth_modificator -> tkOverride + case 673: // meth_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 675: // meth_modificator -> tkExtensionMethod + case 674: // meth_modificator -> tkExtensionMethod { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 676: // meth_modificator -> tkVirtual + case 675: // meth_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 677: // property_specifier_directives -> tkRead + case 676: // property_specifier_directives -> tkRead { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 678: // property_specifier_directives -> tkWrite + case 677: // property_specifier_directives -> tkWrite { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 679: // non_reserved -> tkName + case 678: // non_reserved -> tkName { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 680: // non_reserved -> tkNew + case 679: // non_reserved -> tkNew { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 681: // visibility_specifier -> tkInternal + case 680: // visibility_specifier -> tkInternal { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 682: // visibility_specifier -> tkPublic + case 681: // visibility_specifier -> tkPublic { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 683: // visibility_specifier -> tkProtected + case 682: // visibility_specifier -> tkProtected { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 684: // visibility_specifier -> tkPrivate + case 683: // visibility_specifier -> tkPrivate { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 685: // keyword -> visibility_specifier + case 684: // keyword -> visibility_specifier { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 686: // keyword -> tkSealed + case 685: // keyword -> tkSealed { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 687: // keyword -> tkTemplate + case 686: // keyword -> tkTemplate { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 688: // keyword -> tkOr + case 687: // keyword -> tkOr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 689: // keyword -> tkTypeOf + case 688: // keyword -> tkTypeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 690: // keyword -> tkSizeOf + case 689: // keyword -> tkSizeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 691: // keyword -> tkDefault + case 690: // keyword -> tkDefault { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 692: // keyword -> tkWhere + case 691: // keyword -> tkWhere { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 693: // keyword -> tkXor + case 692: // keyword -> tkXor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 694: // keyword -> tkAnd + case 693: // keyword -> tkAnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 695: // keyword -> tkDiv + case 694: // keyword -> tkDiv { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 696: // keyword -> tkMod + case 695: // keyword -> tkMod { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 697: // keyword -> tkShl + case 696: // keyword -> tkShl { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 698: // keyword -> tkShr + case 697: // keyword -> tkShr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 699: // keyword -> tkNot + case 698: // keyword -> tkNot { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 700: // keyword -> tkAs + case 699: // keyword -> tkAs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 701: // keyword -> tkIn + case 700: // keyword -> tkIn { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 702: // keyword -> tkIs + case 701: // keyword -> tkIs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 703: // keyword -> tkArray + case 702: // keyword -> tkArray { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 704: // keyword -> tkSequence + case 703: // keyword -> tkSequence { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 705: // keyword -> tkBegin + case 704: // keyword -> tkBegin { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 706: // keyword -> tkCase + case 705: // keyword -> tkCase { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 707: // keyword -> tkClass + case 706: // keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 708: // keyword -> tkConst + case 707: // keyword -> tkConst { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 709: // keyword -> tkConstructor + case 708: // keyword -> tkConstructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 710: // keyword -> tkDestructor + case 709: // keyword -> tkDestructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 711: // keyword -> tkDownto + case 710: // keyword -> tkDownto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 712: // keyword -> tkDo + case 711: // keyword -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 713: // keyword -> tkElse + case 712: // keyword -> tkElse { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 714: // keyword -> tkExcept + case 713: // keyword -> tkExcept { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 715: // keyword -> tkFile + case 714: // keyword -> tkFile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 716: // keyword -> tkAuto + case 715: // keyword -> tkAuto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 717: // keyword -> tkFinalization + case 716: // keyword -> tkFinalization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 718: // keyword -> tkFinally + case 717: // keyword -> tkFinally { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 719: // keyword -> tkFor + case 718: // keyword -> tkFor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 720: // keyword -> tkForeach + case 719: // keyword -> tkForeach { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 721: // keyword -> tkFunction + case 720: // keyword -> tkFunction { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 722: // keyword -> tkIf + case 721: // keyword -> tkIf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 723: // keyword -> tkImplementation + case 722: // keyword -> tkImplementation { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 724: // keyword -> tkInherited + case 723: // keyword -> tkInherited { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 725: // keyword -> tkInitialization + case 724: // keyword -> tkInitialization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 726: // keyword -> tkInterface + case 725: // keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 727: // keyword -> tkProcedure + case 726: // keyword -> tkProcedure { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 728: // keyword -> tkProperty + case 727: // keyword -> tkProperty { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 729: // keyword -> tkRaise + case 728: // keyword -> tkRaise { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 730: // keyword -> tkRecord + case 729: // keyword -> tkRecord { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 731: // keyword -> tkRepeat + case 730: // keyword -> tkRepeat { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 732: // keyword -> tkSet + case 731: // keyword -> tkSet { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 733: // keyword -> tkTry + case 732: // keyword -> tkTry { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 734: // keyword -> tkType + case 733: // keyword -> tkType { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 735: // keyword -> tkThen + case 734: // keyword -> tkThen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 736: // keyword -> tkTo + case 735: // keyword -> tkTo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 737: // keyword -> tkUntil + case 736: // keyword -> tkUntil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 738: // keyword -> tkUses + case 737: // keyword -> tkUses { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 739: // keyword -> tkVar + case 738: // keyword -> tkVar { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 740: // keyword -> tkWhile + case 739: // keyword -> tkWhile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 741: // keyword -> tkWith + case 740: // keyword -> tkWith { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 742: // keyword -> tkNil + case 741: // keyword -> tkNil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 743: // keyword -> tkGoto + case 742: // keyword -> tkGoto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 744: // keyword -> tkOf + case 743: // keyword -> tkOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 745: // keyword -> tkLabel + case 744: // keyword -> tkLabel { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 746: // keyword -> tkProgram + case 745: // keyword -> tkProgram { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 747: // keyword -> tkUnit + case 746: // keyword -> tkUnit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 748: // keyword -> tkLibrary + case 747: // keyword -> tkLibrary { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 749: // keyword -> tkExternal + case 748: // keyword -> tkExternal { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 750: // keyword -> tkParams + case 749: // keyword -> tkParams { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 751: // keyword -> tkEvent + case 750: // keyword -> tkEvent { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 752: // keyword -> tkYield + case 751: // keyword -> tkYield { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 753: // reserved_keyword -> tkOperator + case 752: // reserved_keyword -> tkOperator { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 754: // reserved_keyword -> tkEnd + case 753: // reserved_keyword -> tkEnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 755: // overload_operator -> tkMinus + case 754: // overload_operator -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 756: // overload_operator -> tkPlus + case 755: // overload_operator -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 757: // overload_operator -> tkSlash + case 756: // overload_operator -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 758: // overload_operator -> tkStar + case 757: // overload_operator -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 759: // overload_operator -> tkEqual + case 758: // overload_operator -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 760: // overload_operator -> tkGreater + case 759: // overload_operator -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 761: // overload_operator -> tkGreaterEqual + case 760: // overload_operator -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 762: // overload_operator -> tkLower + case 761: // overload_operator -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 763: // overload_operator -> tkLowerEqual + case 762: // overload_operator -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 764: // overload_operator -> tkNotEqual + case 763: // overload_operator -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 765: // overload_operator -> tkOr + case 764: // overload_operator -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 766: // overload_operator -> tkXor + case 765: // overload_operator -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 767: // overload_operator -> tkAnd + case 766: // overload_operator -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 768: // overload_operator -> tkDiv + case 767: // overload_operator -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 769: // overload_operator -> tkMod + case 768: // overload_operator -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 770: // overload_operator -> tkShl + case 769: // overload_operator -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 771: // overload_operator -> tkShr + case 770: // overload_operator -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 772: // overload_operator -> tkNot + case 771: // overload_operator -> tkNot { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 773: // overload_operator -> tkIn + case 772: // overload_operator -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 774: // overload_operator -> tkImplicit + case 773: // overload_operator -> tkImplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 775: // overload_operator -> tkExplicit + case 774: // overload_operator -> tkExplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 776: // overload_operator -> assign_operator + case 775: // overload_operator -> assign_operator { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 777: // assign_operator -> tkAssign + case 776: // assign_operator -> tkAssign { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 778: // assign_operator -> tkPlusEqual + case 777: // assign_operator -> tkPlusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 779: // assign_operator -> tkMinusEqual + case 778: // assign_operator -> tkMinusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 780: // assign_operator -> tkMultEqual + case 779: // assign_operator -> tkMultEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 781: // assign_operator -> tkDivEqual + case 780: // assign_operator -> tkDivEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 782: // func_decl_lambda -> identifier, tkArrow, lambda_function_body + case 781: // func_decl_lambda -> identifier, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-3].id, LocationStack[LocationStack.Depth-3]); var formalPars = new formal_parameters(new typed_parameters(idList, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null), parametr_kind.none, null, LocationStack[LocationStack.Depth-3]), LocationStack[LocationStack.Depth-3]); CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), formalPars, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null), ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 783: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, + case 782: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, // tkArrow, lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 784: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, + case 783: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-7].id, LocationStack[LocationStack.Depth-7]); @@ -5651,7 +5639,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, + case 784: // func_decl_lambda -> tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, // tkRoundClose, lambda_type_ref_noproctype, tkArrow, // lambda_function_body { @@ -5662,7 +5650,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, + case 785: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, // full_lambda_fp_list, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { @@ -5674,7 +5662,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, expr_l1, tkComma, expr_l1_list, + case 786: // func_decl_lambda -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, // lambda_type_ref, optional_full_lambda_fp_list, // tkRoundClose, rem_lambda { @@ -5736,61 +5724,61 @@ public partial class GPPGParser: ShiftReduceParser expl_func_decl_lambda + case 787: // func_decl_lambda -> expl_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 789: // optional_full_lambda_fp_list -> /* empty */ + case 788: // optional_full_lambda_fp_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 790: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list + case 789: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 791: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body + case 790: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body { CurrentSemanticValue.ob = new pair_type_stlist(ValueStack[ValueStack.Depth-3].td,ValueStack[ValueStack.Depth-1].stn as statement_list); } break; - case 792: // expl_func_decl_lambda -> tkFunction, lambda_type_ref, tkArrow, + case 791: // expl_func_decl_lambda -> tkFunction, lambda_type_ref, tkArrow, // lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 793: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, lambda_type_ref, + case 792: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, lambda_type_ref, // tkArrow, lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 794: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, + case 793: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, lambda_type_ref, tkArrow, // lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 795: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body + case 794: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 796: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, + case 795: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, // lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 797: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, + case 796: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), ValueStack[ValueStack.Depth-4].stn as formal_parameters, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 798: // full_lambda_fp_list -> lambda_simple_fp_sect + case 797: // full_lambda_fp_list -> lambda_simple_fp_sect { var typed_pars = ValueStack[ValueStack.Depth-1].stn as typed_parameters; if (typed_pars.vars_type is lambda_inferred_type) @@ -5810,147 +5798,147 @@ public partial class GPPGParser: ShiftReduceParser full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect + case 798: // full_lambda_fp_list -> full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect { CurrentSemanticValue.stn =(ValueStack[ValueStack.Depth-3].stn as formal_parameters).Add(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 800: // lambda_simple_fp_sect -> ident_list, lambda_type_ref + case 799: // lambda_simple_fp_sect -> ident_list, lambda_type_ref { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-2].stn as ident_list, ValueStack[ValueStack.Depth-1].td, parametr_kind.none, null, CurrentLocationSpan); } break; - case 801: // lambda_type_ref -> /* empty */ + case 800: // lambda_type_ref -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 802: // lambda_type_ref -> tkColon, fptype + case 801: // lambda_type_ref -> tkColon, fptype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 803: // lambda_type_ref_noproctype -> /* empty */ + case 802: // lambda_type_ref_noproctype -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 804: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype + case 803: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 805: // lambda_function_body -> expr_l1 + case 804: // lambda_function_body -> expr_l1 { CurrentSemanticValue.stn = NewLambdaBody(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 806: // lambda_function_body -> compound_stmt + case 805: // lambda_function_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 807: // lambda_function_body -> if_stmt + case 806: // lambda_function_body -> if_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 808: // lambda_function_body -> while_stmt + case 807: // lambda_function_body -> while_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 809: // lambda_function_body -> repeat_stmt + case 808: // lambda_function_body -> repeat_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 810: // lambda_function_body -> for_stmt + case 809: // lambda_function_body -> for_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 811: // lambda_function_body -> foreach_stmt + case 810: // lambda_function_body -> foreach_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 812: // lambda_function_body -> case_stmt + case 811: // lambda_function_body -> case_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 813: // lambda_function_body -> try_stmt + case 812: // lambda_function_body -> try_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 814: // lambda_function_body -> lock_stmt + case 813: // lambda_function_body -> lock_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 815: // lambda_function_body -> yield_stmt + case 814: // lambda_function_body -> yield_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 816: // lambda_procedure_body -> proc_call + case 815: // lambda_procedure_body -> proc_call { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 817: // lambda_procedure_body -> compound_stmt + case 816: // lambda_procedure_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 818: // lambda_procedure_body -> if_stmt + case 817: // lambda_procedure_body -> if_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 819: // lambda_procedure_body -> while_stmt + case 818: // lambda_procedure_body -> while_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 820: // lambda_procedure_body -> repeat_stmt + case 819: // lambda_procedure_body -> repeat_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 821: // lambda_procedure_body -> for_stmt + case 820: // lambda_procedure_body -> for_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 822: // lambda_procedure_body -> foreach_stmt + case 821: // lambda_procedure_body -> foreach_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 823: // lambda_procedure_body -> case_stmt + case 822: // lambda_procedure_body -> case_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 824: // lambda_procedure_body -> try_stmt + case 823: // lambda_procedure_body -> try_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 825: // lambda_procedure_body -> lock_stmt + case 824: // lambda_procedure_body -> lock_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 826: // lambda_procedure_body -> yield_stmt + case 825: // lambda_procedure_body -> yield_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 827: // lambda_procedure_body -> assignment + case 826: // lambda_procedure_body -> assignment { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } diff --git a/Parsers/PascalABCParserNewSaushkin/Keywords.cs b/Parsers/PascalABCParserNewSaushkin/Keywords.cs index fa9f4074a..cd80a3857 100644 --- a/Parsers/PascalABCParserNewSaushkin/Keywords.cs +++ b/Parsers/PascalABCParserNewSaushkin/Keywords.cs @@ -102,7 +102,6 @@ namespace GPPGParserScanner keywords.Add(Convert("record"), (int)Tokens.tkRecord); keywords.Add(Convert("repeat"), (int)Tokens.tkRepeat); keywords.Add(Convert("set"), (int)Tokens.tkSet); - keywords.Add(Convert("step"), (int)Tokens.tkStep); keywords.Add(Convert("try"), (int)Tokens.tkTry); keywords.Add(Convert("type"), (int)Tokens.tkType); keywords.Add(Convert("then"), (int)Tokens.tkThen); diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 20bb71c6b..6df2ea656 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -172,6 +172,5 @@ script= - diff --git a/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs b/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs index 90e068664..c880652d3 100644 --- a/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs +++ b/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs @@ -274,9 +274,9 @@ namespace GPPGParserScanner return nws; } - public for_node NewForStmt(bool opt_var, ident identifier, type_definition for_stmt_decl_or_assign, expression expr1, for_cycle_type fc_type, expression expr2, expression IncrementValue, token_info opt_tk_do, statement stmt, LexLocation loc) + public for_node NewForStmt(bool opt_var, ident identifier, type_definition for_stmt_decl_or_assign, expression expr1, for_cycle_type fc_type, expression expr2, token_info opt_tk_do, statement stmt, LexLocation loc) { - var nfs = new for_node(identifier, expr1, expr2, stmt, fc_type, IncrementValue, for_stmt_decl_or_assign, opt_var != false, loc); + var nfs = new for_node(identifier, expr1, expr2, stmt, fc_type, null, for_stmt_decl_or_assign, opt_var != false, loc); if (opt_tk_do == null) { file_position fp = expr2.source_context.end_position; diff --git a/bin/Lib/DrawManField.pas b/bin/Lib/DrawManField.pas index 6f182546a..594c8b947 100644 --- a/bin/Lib/DrawManField.pas +++ b/bin/Lib/DrawManField.pas @@ -25,17 +25,6 @@ var ZazY1 := 5; ZazX2 := 10; ZazY2 := 16; - - HelpStr := 'Разработчик исполнителя Чертежник: Михалкович С.С., 2002-17 '#10#13#10#13+ - 'Команды исполнителя Чертежник:'#10#13+ - ' PenDown - опустить перо'#10#13+ - ' PenUp - поднять перо'#10#13 - ' ToPoint(x,y) - переместиться в точку с координатами (x,y)'#10#13+ - ' OnVector(a,b) - переместиться из текущей точки на вектор (a,b)'#10#13 - ' a>0 - вправо, a<0 - влево, b>0 - вверх, b<0 - вниз'#10#13 - ' Task(name) - вызвать задание с указанным именем'#10#13 - ' StandardField - вызвать стандартное поле'#10#13 - ' Field(n,m) - вызвать поле размера n на m'#10#13#10#13; type TDMField = class @@ -612,7 +601,18 @@ end; procedure buttonHelpClick(o: Object; e: EventArgs); begin - MessageBox.Show(HelpStr,'Исполнитель Чертежник - Справка'); + MessageBox.Show('Разработчик исполнителя Чертежник: Михалкович С.С., 2002-07 '#10#13#10#13+ + 'Команды исполнителя Чертежник:'#10#13+ + ' PenDown - опустить перо'#10#13+ + ' PenUp - поднять перо'#10#13 + ' ToPoint(x,y) - переместиться в точку с координатами (x,y)'#10#13+ + ' OnVector(a,b) - переместиться из текущей точки на вектор (a,b)'#10#13 + ' a>0 - вправо, a<0 - влево, b>0 - вверх, b<0 - вниз'#10#13 + ' Speed(n) - установить скорость n (n=0..10)'#10#13 + ' Stop - остановить Чертежника'#10#13 + ' Start - запустить Чертежника'#10#13, + 'Исполнитель Чертежник - Справка'); + (GraphABCControl as Control).Focus; end; diff --git a/bin/Lib/RobotField.pas b/bin/Lib/RobotField.pas index 25947ad27..cdd85620b 100644 --- a/bin/Lib/RobotField.pas +++ b/bin/Lib/RobotField.pas @@ -27,29 +27,6 @@ var LabelBadEndColor: Color; LabelGoodEndColor: Color; - HelpStr := -'Разработчик исполнителя Робот: Михалкович С.С., 2002-17 '#10#13#10#13+ - 'Команды исполнителя Робот:'#10#13+ - ' Right - вправо'#10#13+ - ' Left - влево'#10#13 - ' Up - вверх'#10#13+ - ' Down - вниз'#10#13 - ' Paint - закрасить текущую клетку'#10#13 - ' Task(name) - вызвать задание с указанным именем'#10#13 - ' StandardField - вызвать стандартное поле'#10#13 - ' Field(n,m) - вызвать поле размера n на m'#10#13#10#13 - 'Условия, проверяемые исполнителем Робот:'#10#13 - ' WallFromRight - справа стена'#10#13 - ' WallFromLeft - слева стена'#10#13 - ' WallFromUp - сверху стена'#10#13 - ' WallFromDown - снизу стена'#10#13 - ' FreeFromRight - справа свободно'#10#13 - ' FreeFromLeft - слева свободно'#10#13 - ' FreeFromUp - сверху свободно'#10#13 - ' FreeFromDown - снизу свободно'#10#13 - ' CellIsPainted - клетка закрашена'#10#13 - ' CellIsFree - клетка не закрашена'#10#13; - type TRobotField = class private @@ -254,33 +231,35 @@ begin end; procedure TRobotField.DrawFieldOnly; +var ix,iy,w,h: integer; begin - var w := CellSize*DimX; - var h := CellSize*DimY; + w := CellSize*DimX; + h := CellSize*DimY; Brush.Color := clWhite; FillRectangle(X0,Y0,X0+w+1,Y0+h+1); Pen.Width := 1; Pen.Color := RGB(191,191,191); - for var ix:=0 to DimX do + for ix:=0 to DimX do Line(X0+ix*CellSize,Y0,X0+ix*CellSize,Y0+h); - for var iy:=0 to DimY do + for iy:=0 to DimY do Line(X0,Y0+iy*CellSize,X0+w,Y0+iy*CellSize); end; procedure TRobotField.Draw0; +var x,y: integer; begin DrawFieldOnly; Pen.Color:=clBlack; Pen.Width:=3; - for var x:=1 to DimX do - for var y:=0 to DimY do + for x:=1 to DimX do + for y:=0 to DimY do if HorizWalls[x,y] then begin MoveTo(X0+(x-1)*CellSize,Y0+y*CellSize); LineTo(X0+x*CellSize,Y0+y*CellSize); end; - for var x:=0 to DimX do - for var y:=1 to DimY do + for x:=0 to DimX do + for y:=1 to DimY do if VertWalls[x,y] then begin MoveTo(X0+x*CellSize,Y0+(y-1)*CellSize); @@ -289,8 +268,8 @@ begin Pen.Color:=clBlack; Pen.Width:=1; - for var x:=1 to DimX do - for var y:=1 to DimY do + for x:=1 to DimX do + for y:=1 to DimY do DrawCell(x,y); end; @@ -386,9 +365,10 @@ begin end; procedure TRobotField.SetTagRect(x1,y1,x2,y2: integer); +var x,y: integer; begin - for var x:=x1 to x2 do - for var y:=y1 to y2 do + for x:=x1 to x2 do + for y:=y1 to y2 do SetTag(x,y); end; @@ -568,14 +548,16 @@ begin end; procedure TRobotField.HorizWall(x,y,len: integer); +var xx: integer; begin - for var xx:=x to x+len-1 do + for xx:=x to x+len-1 do HorizWalls[xx,y] := True; end; procedure TRobotField.VertWall(x,y,len: integer); +var yy: integer; begin - for var yy:=y to y+len-1 do + for yy:=y to y+len-1 do VertWalls[x,yy] := True; end; @@ -622,15 +604,16 @@ begin end; procedure TRobotField.Clear; +var x,y: integer; begin - for var x:=1 to Max_DimX do - for var y:=0 to Max_DimY do + for x:=1 to Max_DimX do + for y:=0 to Max_DimY do HorizWalls[x,y] := False; - for var x:=0 to Max_DimX do - for var y:=1 to Max_DimY do + for x:=0 to Max_DimX do + for y:=1 to Max_DimY do VertWalls[x,y] := False; - for var x:=1 to Max_DimX do - for var y:=1 to Max_DimY do + for x:=1 to Max_DimX do + for y:=1 to Max_DimY do begin Painted[x,y] := 0; Tags[x,y] := False; @@ -645,10 +628,12 @@ end; function TRobotField.IsSolution: boolean; label 1; +var x,y: integer; + ID: boolean; begin - var ID:=True; - for var x:=1 to DimX do - for var y:=1 to DimY do + ID:=True; + for x:=1 to DimX do + for y:=1 to DimY do begin //ID := ID and (((Tags[x,y]=True) and ((Painted[x,y]=1) or (Painted[x,y]=2))) or ((Tags[x,y]=False) and ((Painted[x,y]=0) or (Painted[x,y]=2)))); ID := ID and (((Tags[x,y]=True) and (Painted[x,y] in [1,2])) or ((Tags[x,y]=False) and (Painted[x,y] in [0,2]))); @@ -661,8 +646,9 @@ end; //--------- Интерфейс и обработчики procedure LoadIni(var settings: IniSettings); +var Ini: TIniFile; begin - var Ini := new TIniFile(IniFileName); + Ini := new TIniFile(IniFileName); settings.Width := Ini.ReadInteger('RobotWindow','Width',679); settings.Height := Ini.ReadInteger('RobotWindow','Height',490); settings.Left := Ini.ReadInteger('RobotWindow','Left',(Screen.PrimaryScreen.Bounds.Width-settings.Width) div 2); @@ -692,10 +678,11 @@ begin end; procedure SaveIni; +var Ini: TIniFile; begin if (MainForm.Left<0) or (MainForm.Top<0) then exit; - var Ini := new TIniFile(IniFileName); + Ini := new TIniFile(IniFileName); Ini.WriteInteger('RobotWindow','Width',MainForm.Width); Ini.WriteInteger('RobotWindow','Height',MainForm.Height); Ini.WriteInteger('RobotWindow','Left',MainForm.Left); @@ -710,9 +697,15 @@ begin halt; end; -procedure ABCWindowResize(o: Object; e: EventArgs) := CorrectWHLT; +procedure ABCWindowResize(o: Object; e: EventArgs); +begin + CorrectWHLT; +end; -procedure MainWindowClose := SaveIni; +procedure MainWindowClose; +begin + SaveIni; +end; procedure buttonStartClick(o: Object; e: EventArgs); begin @@ -741,7 +734,28 @@ end; procedure buttonHelpClick(o: Object; e: EventArgs); begin - MessageBox.Show(HelpStr,'Исполнитель Робот - Справка'); + MessageBox.Show('Разработчик исполнителя Робот: Михалкович С.С., 2002-07 '#10#13#10#13+ + 'Команды исполнителя Робот:'#10#13+ + ' Right - вправо'#10#13+ + ' Left - влево'#10#13 + ' Up - вверх'#10#13+ + ' Down - вниз'#10#13 + ' Paint - закрасить текущую клетку'#10#13 + ' Speed(n) - установить скорость n (n=0..10)'#10#13 + ' Stop - остановить Робота'#10#13 + ' Start - запустить Робота'#10#13#10#13 + 'Условия, проверяемые исполнителем Робот:'#10#13 + ' WallFromRight - справа стена'#10#13 + ' WallFromLeft - слева стена;'#10#13 + ' WallFromUp - сверху стена;'#10#13 + ' WallFromDown - снизу стена;'#10#13 + ' FreeFromRight - справа свободно;'#10#13 + ' FreeFromLeft - слева свободно;'#10#13 + ' FreeFromUp - сверху свободно;'#10#13 + ' FreeFromDown - снизу свободно;'#10#13 + ' CellIsPainted - клетка закрашена;'#10#13 + ' CellIsFree - клетка не закрашена.'#10#13, + 'Исполнитель Робот - Справка'); (GraphABCControl as Control).Focus; end; diff --git a/bin/Lib/Робот.pas b/bin/Lib/Робот.pas deleted file mode 100644 index b69df45c4..000000000 --- a/bin/Lib/Робот.pas +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mihalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -///Исполнитель Робот действует на прямоугольном клеточном поле. Между некоторыми клетками, а также по периметру поля находятся стены. -///Основная цель Робота – закрасить указанные клетки и переместиться в конечную клетку. -unit Робот; - -uses Robot,RobotField; - -procedure Вправо := Right; -procedure Влево := Left; -procedure Вверх := Up; -procedure Вниз := Down; -procedure Закрасить := Paint; -function СправаСвободно := FreeFromRight; -function СлеваСвободно := FreeFromLeft; -function СверхуСвободно := FreeFromUp; -function СнизуСвободно := FreeFromDown; -function СправаСтена := WallFromRight; -function СлеваСтена := WallFromLeft; -function СверхуСтена := WallFromUp; -function СнизуСтена := WallFromDown; -function КлеткаНеЗакрашена := CellIsFree; -function КлеткаЗакрашена := CellIsPainted; -procedure Задание(имя: string) := Task(имя); -procedure СтандартноеПоле := StandardField; -procedure Поле(n,m: integer) := Field(n,m); - -begin - HelpStr := -'Разработчик исполнителя Робот: Михалкович С.С., 2002-17 '#10#13#10#13+ - 'Команды исполнителя Робот:'#10#13+ - ' Вправо'#10#13+ - ' Влево'#10#13 - ' Вверх'#10#13+ - ' Вниз'#10#13 - ' Закрасить - закрасить текущую клетку'#10#13 - ' Задание(имя) - вызвать задание с указанным именем'#10#13 - ' СтандартноеПоле - вызвать стандартное поле'#10#13 - ' Поле(n,m) - вызвать поле размера n на m'#10#13 - 'Условия, проверяемые исполнителем Робот:'#10#13 - ' СправаСтена'#10#13 - ' СлеваСтена'#10#13 - ' СверхуСтена'#10#13 - ' СнизуСтена'#10#13 - ' СправаСвободно'#10#13 - ' СлеваСвободно'#10#13 - ' СверхуСвободно'#10#13 - ' СнизуСвободно'#10#13 - ' КлеткаЗакрашена'#10#13 - ' КлеткаНеЗакрашена'#10#13; -end. \ No newline at end of file diff --git a/bin/Lib/Чертежник.pas b/bin/Lib/Чертежник.pas deleted file mode 100644 index 5cdf4a292..000000000 --- a/bin/Lib/Чертежник.pas +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mihalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -///Исполнитель Чертежник предназначен для построения рисунков и чертежей на плоскости с координатами. -///Чертежник имеет перо, которое он может поднимать, опускать и перемещать. При перемещении опущенного пера за ним остается след. -unit Чертежник; - -uses Drawman,DrawManField; - -procedure ОпуститьПеро := PenDown; -procedure ПоднятьПеро := PenUp; -procedure КТочке(x,y: integer) := ToPoint(x,y); -procedure НаВектор(a,b: integer) := OnVector(a,b); -procedure Задание(имя: string) := Task(имя); -procedure СтандартноеПоле := StandardField; -procedure Поле(n,m: integer) := Field(n,m); - -begin - HelpStr := 'Разработчик исполнителя Чертежник: Михалкович С.С., 2002-17 '#10#13#10#13+ - 'Команды исполнителя Чертежник:'#10#13+ - ' ОпуститьПеро'#10#13+ - ' ПоднятьПеро'#10#13 - ' КТочке(x,y) - переместиться в точку с координатами (x,y)'#10#13+ - ' НаВектор(a,b) - переместиться из текущей точки на вектор (a,b)'#10#13 - ' a>0 - вправо, a<0 - влево, b>0 - вверх, b<0 - вниз'#10#13 - ' Задание(name) - вызвать задание с указанным именем'#10#13 - ' СтандартноеПоле - вызвать стандартное поле'#10#13 - ' Поле(n,m) - вызвать поле размера n на m'#10#13#10#13; -end. \ No newline at end of file