diff --git a/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/TqCLLibraryProvider.java b/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/TqCLLibraryProvider.java index cfae556d..7c3c1ccf 100644 --- a/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/TqCLLibraryProvider.java +++ b/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/TqCLLibraryProvider.java @@ -23,7 +23,7 @@ public interface TqCLLibraryProvider { public List getDirectors(String library) throws TqCLLibraryException; - public List getParameterTypes(String library) throws TqCLLibraryException; + public List getParameterTypes(String library) throws TqCLLibraryException; public List getPortTypes(String library) throws TqCLLibraryException; @@ -38,5 +38,7 @@ public interface TqCLLibraryProvider { public boolean hasElementInLibrary(String element, String library, String category); public EntityDescriptor getDirector(String directorClass) throws TqCLLibraryException; + + public EntityDescriptor getParameter(String parameterClass); } diff --git a/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/impl/TcQLLibraryProviderProxy.java b/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/impl/TcQLLibraryProviderProxy.java index 6c18f716..82b5f967 100644 --- a/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/impl/TcQLLibraryProviderProxy.java +++ b/org.eclipse.triquetrum.commands.api/src/main/java/org/eclipse/triquetrum/commands/api/services/impl/TcQLLibraryProviderProxy.java @@ -20,6 +20,7 @@ import org.eclipse.triquetrum.commands.api.services.ActorDescriptor; import org.eclipse.triquetrum.commands.api.services.DirectorDescriptor; import org.eclipse.triquetrum.commands.api.services.EntityDescriptor; +import org.eclipse.triquetrum.commands.api.services.ParameterDescriptor; import org.eclipse.triquetrum.commands.api.services.TqCLLibraryException; import org.eclipse.triquetrum.commands.api.services.TqCLLibraryProvider; @@ -48,7 +49,7 @@ public List getDirectors(String library) throws TqCLLibraryE } @Override - public List getParameterTypes(String library) throws TqCLLibraryException { + public List getParameterTypes(String library) throws TqCLLibraryException { checkLibrary(library); return libraryProviders.get(library).getParameterTypes(library); } @@ -126,10 +127,21 @@ public EntityDescriptor getActor(String actorClass) throws TqCLLibraryException @Override public EntityDescriptor getDirector(String directorClass) throws TqCLLibraryException { for (TqCLLibraryProvider provider : libraryProviders.values()) { - EntityDescriptor actor = provider.getDirector(directorClass); - if(actor!=null) + EntityDescriptor director = provider.getDirector(directorClass); + if(director!=null) { - return actor; + return director; + } + } + return null; + } + @Override + public EntityDescriptor getParameter(String parameterClass) { + for (TqCLLibraryProvider provider : libraryProviders.values()) { + EntityDescriptor parameter = provider.getParameter(parameterClass); + if(parameter!=null) + { + return parameter; } } return null; diff --git a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/TqclParser.java b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/TqclParser.java index e51bc34e..97b5974b 100644 --- a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/TqclParser.java +++ b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/TqclParser.java @@ -44,12 +44,15 @@ protected String getRuleName(AbstractElement element) { nameMappings = new HashMap() { private static final long serialVersionUID = 1L; { - put(grammarAccess.getCommandAccess().getAlternatives_0(), "rule__Command__Alternatives_0"); + put(grammarAccess.getCompositeCommandAccess().getEndAlternatives_2_0(), "rule__CompositeCommand__EndAlternatives_2_0"); + put(grammarAccess.getSimpleCommandAccess().getAlternatives_0(), "rule__SimpleCommand__Alternatives_0"); + put(grammarAccess.getCommandAccess().getAlternatives(), "rule__Command__Alternatives"); put(grammarAccess.getParameter_idAccess().getAlternatives(), "rule__Parameter_id__Alternatives"); put(grammarAccess.getNamedObjAccess().getAlternatives(), "rule__NamedObj__Alternatives"); put(grammarAccess.getCategoryAccess().getAlternatives(), "rule__Category__Alternatives"); put(grammarAccess.getTriquetrumScriptAccess().getGroup(), "rule__TriquetrumScript__Group__0"); - put(grammarAccess.getCommandAccess().getGroup(), "rule__Command__Group__0"); + put(grammarAccess.getCompositeCommandAccess().getGroup(), "rule__CompositeCommand__Group__0"); + put(grammarAccess.getSimpleCommandAccess().getGroup(), "rule__SimpleCommand__Group__0"); put(grammarAccess.getIncludeAccess().getGroup(), "rule__Include__Group__0"); put(grammarAccess.getLibraryAccess().getGroup(), "rule__Library__Group__0"); put(grammarAccess.getInsertAccess().getGroup(), "rule__Insert__Group__0"); @@ -59,13 +62,16 @@ protected String getRuleName(AbstractElement element) { put(grammarAccess.getConnectAccess().getGroup(), "rule__Connect__Group__0"); put(grammarAccess.getConnectAccess().getGroup_2(), "rule__Connect__Group_2__0"); put(grammarAccess.getConnectAccess().getGroup_5(), "rule__Connect__Group_5__0"); + put(grammarAccess.getConnectionPortAccess().getGroup(), "rule__ConnectionPort__Group__0"); put(grammarAccess.getGoIntoAccess().getGroup(), "rule__GoInto__Group__0"); put(grammarAccess.getGoOutAccess().getGroup(), "rule__GoOut__Group__0"); put(grammarAccess.getGoTopAccess().getGroup(), "rule__GoTop__Group__0"); put(grammarAccess.getParameterAccess().getGroup(), "rule__Parameter__Group__0"); - put(grammarAccess.getConnectionPortAccess().getGroup(), "rule__ConnectionPort__Group__0"); put(grammarAccess.getTriquetrumScriptAccess().getLibrariesAssignment_0(), "rule__TriquetrumScript__LibrariesAssignment_0"); put(grammarAccess.getTriquetrumScriptAccess().getCommandsAssignment_1(), "rule__TriquetrumScript__CommandsAssignment_1"); + put(grammarAccess.getCompositeCommandAccess().getStartAssignment_0(), "rule__CompositeCommand__StartAssignment_0"); + put(grammarAccess.getCompositeCommandAccess().getCommandsAssignment_1(), "rule__CompositeCommand__CommandsAssignment_1"); + put(grammarAccess.getCompositeCommandAccess().getEndAssignment_2(), "rule__CompositeCommand__EndAssignment_2"); put(grammarAccess.getIncludeAccess().getFilenameAssignment_1(), "rule__Include__FilenameAssignment_1"); put(grammarAccess.getLibraryAccess().getNameAssignment_1(), "rule__Library__NameAssignment_1"); put(grammarAccess.getInsertAccess().getCategoryAssignment_1(), "rule__Insert__CategoryAssignment_1"); @@ -78,14 +84,14 @@ protected String getRuleName(AbstractElement element) { put(grammarAccess.getConnectAccess().getFromAssignment_2_1(), "rule__Connect__FromAssignment_2_1"); put(grammarAccess.getConnectAccess().getToAssignment_4(), "rule__Connect__ToAssignment_4"); put(grammarAccess.getConnectAccess().getToAssignment_5_1(), "rule__Connect__ToAssignment_5_1"); + put(grammarAccess.getConnectionPortAccess().getActorAssignment_0(), "rule__ConnectionPort__ActorAssignment_0"); + put(grammarAccess.getConnectionPortAccess().getPortAssignment_2(), "rule__ConnectionPort__PortAssignment_2"); put(grammarAccess.getGoIntoAccess().getDirectionAssignment_1(), "rule__GoInto__DirectionAssignment_1"); - put(grammarAccess.getGoIntoAccess().getObjAssignment_2(), "rule__GoInto__ObjAssignment_2"); + put(grammarAccess.getGoIntoAccess().getActorAssignment_2(), "rule__GoInto__ActorAssignment_2"); put(grammarAccess.getGoOutAccess().getDirectionAssignment_1(), "rule__GoOut__DirectionAssignment_1"); put(grammarAccess.getGoTopAccess().getDirectionAssignment_1(), "rule__GoTop__DirectionAssignment_1"); put(grammarAccess.getParameterAccess().getIdAssignment_0(), "rule__Parameter__IdAssignment_0"); put(grammarAccess.getParameterAccess().getValueAssignment_2(), "rule__Parameter__ValueAssignment_2"); - put(grammarAccess.getConnectionPortAccess().getActorAssignment_0(), "rule__ConnectionPort__ActorAssignment_0"); - put(grammarAccess.getConnectionPortAccess().getPortAssignment_2(), "rule__ConnectionPort__PortAssignment_2"); } }; } diff --git a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.g b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.g index 04b2a17f..68b540b9 100644 --- a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.g +++ b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.g @@ -83,6 +83,56 @@ finally { restoreStackSize(stackSize); } +// Entry rule entryRuleCompositeCommand +entryRuleCompositeCommand +: +{ before(grammarAccess.getCompositeCommandRule()); } + ruleCompositeCommand +{ after(grammarAccess.getCompositeCommandRule()); } + EOF +; + +// Rule CompositeCommand +ruleCompositeCommand + @init { + int stackSize = keepStackSize(); + } + : + ( + { before(grammarAccess.getCompositeCommandAccess().getGroup()); } + (rule__CompositeCommand__Group__0) + { after(grammarAccess.getCompositeCommandAccess().getGroup()); } + ) +; +finally { + restoreStackSize(stackSize); +} + +// Entry rule entryRuleSimpleCommand +entryRuleSimpleCommand +: +{ before(grammarAccess.getSimpleCommandRule()); } + ruleSimpleCommand +{ after(grammarAccess.getSimpleCommandRule()); } + EOF +; + +// Rule SimpleCommand +ruleSimpleCommand + @init { + int stackSize = keepStackSize(); + } + : + ( + { before(grammarAccess.getSimpleCommandAccess().getGroup()); } + (rule__SimpleCommand__Group__0) + { after(grammarAccess.getSimpleCommandAccess().getGroup()); } + ) +; +finally { + restoreStackSize(stackSize); +} + // Entry rule entryRuleCommand entryRuleCommand : @@ -99,9 +149,9 @@ ruleCommand } : ( - { before(grammarAccess.getCommandAccess().getGroup()); } - (rule__Command__Group__0) - { after(grammarAccess.getCommandAccess().getGroup()); } + { before(grammarAccess.getCommandAccess().getAlternatives()); } + (rule__Command__Alternatives) + { after(grammarAccess.getCommandAccess().getAlternatives()); } ) ; finally { @@ -233,6 +283,31 @@ finally { restoreStackSize(stackSize); } +// Entry rule entryRuleConnectionPort +entryRuleConnectionPort +: +{ before(grammarAccess.getConnectionPortRule()); } + ruleConnectionPort +{ after(grammarAccess.getConnectionPortRule()); } + EOF +; + +// Rule ConnectionPort +ruleConnectionPort + @init { + int stackSize = keepStackSize(); + } + : + ( + { before(grammarAccess.getConnectionPortAccess().getGroup()); } + (rule__ConnectionPort__Group__0) + { after(grammarAccess.getConnectionPortAccess().getGroup()); } + ) +; +finally { + restoreStackSize(stackSize); +} + // Entry rule entryRuleGoInto entryRuleGoInto : @@ -383,92 +458,91 @@ finally { restoreStackSize(stackSize); } -// Entry rule entryRuleConnectionPort -entryRuleConnectionPort -: -{ before(grammarAccess.getConnectionPortRule()); } - ruleConnectionPort -{ after(grammarAccess.getConnectionPortRule()); } - EOF -; - -// Rule ConnectionPort -ruleConnectionPort +// Rule Category +ruleCategory @init { int stackSize = keepStackSize(); } - : +: ( - { before(grammarAccess.getConnectionPortAccess().getGroup()); } - (rule__ConnectionPort__Group__0) - { after(grammarAccess.getConnectionPortAccess().getGroup()); } + { before(grammarAccess.getCategoryAccess().getAlternatives()); } + (rule__Category__Alternatives) + { after(grammarAccess.getCategoryAccess().getAlternatives()); } ) ; finally { restoreStackSize(stackSize); } -// Rule Category -ruleCategory +rule__CompositeCommand__EndAlternatives_2_0 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getCategoryAccess().getAlternatives()); } - (rule__Category__Alternatives) - { after(grammarAccess.getCategoryAccess().getAlternatives()); } + { before(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); } + ruleGoOut + { after(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); } + ) + | + ( + { before(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); } + ruleGoTop + { after(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); } ) ; finally { restoreStackSize(stackSize); } -rule__Command__Alternatives_0 +rule__SimpleCommand__Alternatives_0 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); } + { before(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); } ruleInsert - { after(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); } + { after(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); } ) | ( - { before(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); } + { before(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); } ruleConnect - { after(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); } + { after(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); } ) | ( - { before(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); } + { before(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); } ruleSet - { after(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); } - ) - | - ( - { before(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); } - ruleGoInto - { after(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); } + { after(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); } ) | ( - { before(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); } - ruleGoOut - { after(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); } + { before(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); } + ruleInclude + { after(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); } ) - | +; +finally { + restoreStackSize(stackSize); +} + +rule__Command__Alternatives + @init { + int stackSize = keepStackSize(); + } +: ( - { before(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); } - ruleGoTop - { after(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); } + { before(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); } + ruleSimpleCommand + { after(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); } ) | ( - { before(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); } - ruleInclude - { after(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); } + { before(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); } + ruleCompositeCommand + { after(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); } ) ; finally { @@ -604,53 +678,134 @@ finally { } -rule__Command__Group__0 +rule__CompositeCommand__Group__0 + @init { + int stackSize = keepStackSize(); + } +: + rule__CompositeCommand__Group__0__Impl + rule__CompositeCommand__Group__1 +; +finally { + restoreStackSize(stackSize); +} + +rule__CompositeCommand__Group__0__Impl + @init { + int stackSize = keepStackSize(); + } +: +( + { before(grammarAccess.getCompositeCommandAccess().getStartAssignment_0()); } + (rule__CompositeCommand__StartAssignment_0) + { after(grammarAccess.getCompositeCommandAccess().getStartAssignment_0()); } +) +; +finally { + restoreStackSize(stackSize); +} + +rule__CompositeCommand__Group__1 + @init { + int stackSize = keepStackSize(); + } +: + rule__CompositeCommand__Group__1__Impl + rule__CompositeCommand__Group__2 +; +finally { + restoreStackSize(stackSize); +} + +rule__CompositeCommand__Group__1__Impl @init { int stackSize = keepStackSize(); } : - rule__Command__Group__0__Impl - rule__Command__Group__1 +( + { before(grammarAccess.getCompositeCommandAccess().getCommandsAssignment_1()); } + (rule__CompositeCommand__CommandsAssignment_1) + { after(grammarAccess.getCompositeCommandAccess().getCommandsAssignment_1()); } +) ; finally { restoreStackSize(stackSize); } -rule__Command__Group__0__Impl +rule__CompositeCommand__Group__2 + @init { + int stackSize = keepStackSize(); + } +: + rule__CompositeCommand__Group__2__Impl +; +finally { + restoreStackSize(stackSize); +} + +rule__CompositeCommand__Group__2__Impl @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getCommandAccess().getAlternatives_0()); } - (rule__Command__Alternatives_0) - { after(grammarAccess.getCommandAccess().getAlternatives_0()); } + { before(grammarAccess.getCompositeCommandAccess().getEndAssignment_2()); } + (rule__CompositeCommand__EndAssignment_2) + { after(grammarAccess.getCompositeCommandAccess().getEndAssignment_2()); } ) ; finally { restoreStackSize(stackSize); } -rule__Command__Group__1 + +rule__SimpleCommand__Group__0 @init { int stackSize = keepStackSize(); } : - rule__Command__Group__1__Impl + rule__SimpleCommand__Group__0__Impl + rule__SimpleCommand__Group__1 ; finally { restoreStackSize(stackSize); } -rule__Command__Group__1__Impl +rule__SimpleCommand__Group__0__Impl @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getCommandAccess().getSemicolonKeyword_1()); } + { before(grammarAccess.getSimpleCommandAccess().getAlternatives_0()); } + (rule__SimpleCommand__Alternatives_0) + { after(grammarAccess.getSimpleCommandAccess().getAlternatives_0()); } +) +; +finally { + restoreStackSize(stackSize); +} + +rule__SimpleCommand__Group__1 + @init { + int stackSize = keepStackSize(); + } +: + rule__SimpleCommand__Group__1__Impl +; +finally { + restoreStackSize(stackSize); +} + +rule__SimpleCommand__Group__1__Impl + @init { + int stackSize = keepStackSize(); + } +: +( + { before(grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); } ';' - { after(grammarAccess.getCommandAccess().getSemicolonKeyword_1()); } + { after(grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); } ) ; finally { @@ -1441,6 +1596,87 @@ finally { } +rule__ConnectionPort__Group__0 + @init { + int stackSize = keepStackSize(); + } +: + rule__ConnectionPort__Group__0__Impl + rule__ConnectionPort__Group__1 +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__Group__0__Impl + @init { + int stackSize = keepStackSize(); + } +: +( + { before(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); } + (rule__ConnectionPort__ActorAssignment_0) + { after(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); } +) +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__Group__1 + @init { + int stackSize = keepStackSize(); + } +: + rule__ConnectionPort__Group__1__Impl + rule__ConnectionPort__Group__2 +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__Group__1__Impl + @init { + int stackSize = keepStackSize(); + } +: +( + { before(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); } + '.' + { after(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); } +) +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__Group__2 + @init { + int stackSize = keepStackSize(); + } +: + rule__ConnectionPort__Group__2__Impl +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__Group__2__Impl + @init { + int stackSize = keepStackSize(); + } +: +( + { before(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); } + (rule__ConnectionPort__PortAssignment_2) + { after(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); } +) +; +finally { + restoreStackSize(stackSize); +} + + rule__GoInto__Group__0 @init { int stackSize = keepStackSize(); @@ -1512,9 +1748,9 @@ rule__GoInto__Group__2__Impl } : ( - { before(grammarAccess.getGoIntoAccess().getObjAssignment_2()); } - (rule__GoInto__ObjAssignment_2) - { after(grammarAccess.getGoIntoAccess().getObjAssignment_2()); } + { before(grammarAccess.getGoIntoAccess().getActorAssignment_2()); } + (rule__GoInto__ActorAssignment_2) + { after(grammarAccess.getGoIntoAccess().getActorAssignment_2()); } ) ; finally { @@ -1711,111 +1947,75 @@ finally { } -rule__ConnectionPort__Group__0 - @init { - int stackSize = keepStackSize(); - } -: - rule__ConnectionPort__Group__0__Impl - rule__ConnectionPort__Group__1 -; -finally { - restoreStackSize(stackSize); -} - -rule__ConnectionPort__Group__0__Impl - @init { - int stackSize = keepStackSize(); - } -: -( - { before(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); } - (rule__ConnectionPort__ActorAssignment_0) - { after(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); } -) -; -finally { - restoreStackSize(stackSize); -} - -rule__ConnectionPort__Group__1 - @init { - int stackSize = keepStackSize(); - } -: - rule__ConnectionPort__Group__1__Impl - rule__ConnectionPort__Group__2 -; -finally { - restoreStackSize(stackSize); -} - -rule__ConnectionPort__Group__1__Impl +rule__TriquetrumScript__LibrariesAssignment_0 @init { int stackSize = keepStackSize(); } : -( - { before(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); } - '.' - { after(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); } -) + ( + { before(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); } + ruleLibrary + { after(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); } + ) ; finally { restoreStackSize(stackSize); } -rule__ConnectionPort__Group__2 +rule__TriquetrumScript__CommandsAssignment_1 @init { int stackSize = keepStackSize(); } : - rule__ConnectionPort__Group__2__Impl + ( + { before(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); } + ruleCommand + { after(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); } + ) ; finally { restoreStackSize(stackSize); } -rule__ConnectionPort__Group__2__Impl +rule__CompositeCommand__StartAssignment_0 @init { int stackSize = keepStackSize(); } : -( - { before(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); } - (rule__ConnectionPort__PortAssignment_2) - { after(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); } -) + ( + { before(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); } + ruleGoInto + { after(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); } + ) ; finally { restoreStackSize(stackSize); } - -rule__TriquetrumScript__LibrariesAssignment_0 +rule__CompositeCommand__CommandsAssignment_1 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); } - ruleLibrary - { after(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); } + { before(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); } + ruleCommand + { after(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); } ) ; finally { restoreStackSize(stackSize); } -rule__TriquetrumScript__CommandsAssignment_1 +rule__CompositeCommand__EndAssignment_2 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); } - ruleCommand - { after(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); } + { before(grammarAccess.getCompositeCommandAccess().getEndAlternatives_2_0()); } + (rule__CompositeCommand__EndAlternatives_2_0) + { after(grammarAccess.getCompositeCommandAccess().getEndAlternatives_2_0()); } ) ; finally { @@ -2002,6 +2202,40 @@ finally { restoreStackSize(stackSize); } +rule__ConnectionPort__ActorAssignment_0 + @init { + int stackSize = keepStackSize(); + } +: + ( + { before(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); } + ( + { before(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); } + RULE_ID + { after(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); } + ) + { after(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); } + ) +; +finally { + restoreStackSize(stackSize); +} + +rule__ConnectionPort__PortAssignment_2 + @init { + int stackSize = keepStackSize(); + } +: + ( + { before(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); } + ruleNamedObj + { after(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); } + ) +; +finally { + restoreStackSize(stackSize); +} + rule__GoInto__DirectionAssignment_1 @init { int stackSize = keepStackSize(); @@ -2021,15 +2255,19 @@ finally { restoreStackSize(stackSize); } -rule__GoInto__ObjAssignment_2 +rule__GoInto__ActorAssignment_2 @init { int stackSize = keepStackSize(); } : ( - { before(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); } - ruleNamedObj - { after(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); } + { before(grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); } + ( + { before(grammarAccess.getGoIntoAccess().getActorInsertIDTerminalRuleCall_2_0_1()); } + RULE_ID + { after(grammarAccess.getGoIntoAccess().getActorInsertIDTerminalRuleCall_2_0_1()); } + ) + { after(grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); } ) ; finally { @@ -2104,40 +2342,6 @@ finally { restoreStackSize(stackSize); } -rule__ConnectionPort__ActorAssignment_0 - @init { - int stackSize = keepStackSize(); - } -: - ( - { before(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); } - ( - { before(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); } - RULE_ID - { after(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); } - ) - { after(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); } - ) -; -finally { - restoreStackSize(stackSize); -} - -rule__ConnectionPort__PortAssignment_2 - @init { - int stackSize = keepStackSize(); - } -: - ( - { before(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); } - ruleNamedObj - { after(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); } - ) -; -finally { - restoreStackSize(stackSize); -} - RULE_PARAMETER_NAME : '$' ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_ENTITY_CLASS : '<' ( options {greedy=false;} : . )*'>'; diff --git a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.tokens b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.tokens index 386ed29c..ec788d1c 100644 --- a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.tokens +++ b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqcl.tokens @@ -1,12 +1,12 @@ ','=23 -'.'=29 +'.'=27 ';'=17 -'='=28 +'='=29 'actor'=13 'as'=21 'connect'=25 'director'=16 -'go'=27 +'go'=28 'include'=18 'insert'=20 'into'=30 diff --git a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclLexer.java b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclLexer.java index ba3bdee6..8ed09b3c 100644 --- a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclLexer.java +++ b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclLexer.java @@ -353,11 +353,10 @@ public final void mT__27() throws RecognitionException { try { int _type = T__27; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:25:7: ( 'go' ) - // InternalTqcl.g:25:9: 'go' + // InternalTqcl.g:25:7: ( '.' ) + // InternalTqcl.g:25:9: '.' { - match("go"); - + match('.'); } @@ -374,10 +373,11 @@ public final void mT__28() throws RecognitionException { try { int _type = T__28; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:26:7: ( '=' ) - // InternalTqcl.g:26:9: '=' + // InternalTqcl.g:26:7: ( 'go' ) + // InternalTqcl.g:26:9: 'go' { - match('='); + match("go"); + } @@ -394,10 +394,10 @@ public final void mT__29() throws RecognitionException { try { int _type = T__29; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:27:7: ( '.' ) - // InternalTqcl.g:27:9: '.' + // InternalTqcl.g:27:7: ( '=' ) + // InternalTqcl.g:27:9: '=' { - match('.'); + match('='); } @@ -477,8 +477,8 @@ public final void mRULE_PARAMETER_NAME() throws RecognitionException { try { int _type = RULE_PARAMETER_NAME; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2141:21: ( '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalTqcl.g:2141:23: '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:2345:21: ( '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalTqcl.g:2345:23: '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { match('$'); if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { @@ -490,7 +490,7 @@ public final void mRULE_PARAMETER_NAME() throws RecognitionException { recover(mse); throw mse;} - // InternalTqcl.g:2141:51: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:2345:51: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop1: do { int alt1=2; @@ -539,11 +539,11 @@ public final void mRULE_ENTITY_CLASS() throws RecognitionException { try { int _type = RULE_ENTITY_CLASS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2143:19: ( '<' ( options {greedy=false; } : . )* '>' ) - // InternalTqcl.g:2143:21: '<' ( options {greedy=false; } : . )* '>' + // InternalTqcl.g:2347:19: ( '<' ( options {greedy=false; } : . )* '>' ) + // InternalTqcl.g:2347:21: '<' ( options {greedy=false; } : . )* '>' { match('<'); - // InternalTqcl.g:2143:25: ( options {greedy=false; } : . )* + // InternalTqcl.g:2347:25: ( options {greedy=false; } : . )* loop2: do { int alt2=2; @@ -559,7 +559,7 @@ else if ( ((LA2_0>='\u0000' && LA2_0<='=')||(LA2_0>='?' && LA2_0<='\uFFFF')) ) { switch (alt2) { case 1 : - // InternalTqcl.g:2143:53: . + // InternalTqcl.g:2347:53: . { matchAny(); @@ -588,10 +588,10 @@ public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2145:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalTqcl.g:2145:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:2349:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalTqcl.g:2349:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalTqcl.g:2145:11: ( '^' )? + // InternalTqcl.g:2349:11: ( '^' )? int alt3=2; int LA3_0 = input.LA(1); @@ -600,7 +600,7 @@ public final void mRULE_ID() throws RecognitionException { } switch (alt3) { case 1 : - // InternalTqcl.g:2145:11: '^' + // InternalTqcl.g:2349:11: '^' { match('^'); @@ -618,7 +618,7 @@ public final void mRULE_ID() throws RecognitionException { recover(mse); throw mse;} - // InternalTqcl.g:2145:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:2349:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop4: do { int alt4=2; @@ -667,10 +667,10 @@ public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2147:10: ( ( '0' .. '9' )+ ) - // InternalTqcl.g:2147:12: ( '0' .. '9' )+ + // InternalTqcl.g:2351:10: ( ( '0' .. '9' )+ ) + // InternalTqcl.g:2351:12: ( '0' .. '9' )+ { - // InternalTqcl.g:2147:12: ( '0' .. '9' )+ + // InternalTqcl.g:2351:12: ( '0' .. '9' )+ int cnt5=0; loop5: do { @@ -684,7 +684,7 @@ public final void mRULE_INT() throws RecognitionException { switch (alt5) { case 1 : - // InternalTqcl.g:2147:13: '0' .. '9' + // InternalTqcl.g:2351:13: '0' .. '9' { matchRange('0','9'); @@ -716,10 +716,10 @@ public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2149:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalTqcl.g:2149:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalTqcl.g:2353:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalTqcl.g:2353:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalTqcl.g:2149:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalTqcl.g:2353:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt8=2; int LA8_0 = input.LA(1); @@ -737,10 +737,10 @@ else if ( (LA8_0=='\'') ) { } switch (alt8) { case 1 : - // InternalTqcl.g:2149:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalTqcl.g:2353:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalTqcl.g:2149:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalTqcl.g:2353:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop6: do { int alt6=3; @@ -756,7 +756,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= switch (alt6) { case 1 : - // InternalTqcl.g:2149:21: '\\\\' . + // InternalTqcl.g:2353:21: '\\\\' . { match('\\'); matchAny(); @@ -764,7 +764,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= } break; case 2 : - // InternalTqcl.g:2149:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalTqcl.g:2353:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -789,10 +789,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= } break; case 2 : - // InternalTqcl.g:2149:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalTqcl.g:2353:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalTqcl.g:2149:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalTqcl.g:2353:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop7: do { int alt7=3; @@ -808,7 +808,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>= switch (alt7) { case 1 : - // InternalTqcl.g:2149:54: '\\\\' . + // InternalTqcl.g:2353:54: '\\\\' . { match('\\'); matchAny(); @@ -816,7 +816,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>= } break; case 2 : - // InternalTqcl.g:2149:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalTqcl.g:2353:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -859,12 +859,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2151:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalTqcl.g:2151:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalTqcl.g:2355:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalTqcl.g:2355:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalTqcl.g:2151:24: ( options {greedy=false; } : . )* + // InternalTqcl.g:2355:24: ( options {greedy=false; } : . )* loop9: do { int alt9=2; @@ -889,7 +889,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) { switch (alt9) { case 1 : - // InternalTqcl.g:2151:52: . + // InternalTqcl.g:2355:52: . { matchAny(); @@ -919,12 +919,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2153:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalTqcl.g:2153:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalTqcl.g:2357:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalTqcl.g:2357:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalTqcl.g:2153:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalTqcl.g:2357:24: (~ ( ( '\\n' | '\\r' ) ) )* loop10: do { int alt10=2; @@ -937,7 +937,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { switch (alt10) { case 1 : - // InternalTqcl.g:2153:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalTqcl.g:2357:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -957,7 +957,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } } while (true); - // InternalTqcl.g:2153:40: ( ( '\\r' )? '\\n' )? + // InternalTqcl.g:2357:40: ( ( '\\r' )? '\\n' )? int alt12=2; int LA12_0 = input.LA(1); @@ -966,9 +966,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } switch (alt12) { case 1 : - // InternalTqcl.g:2153:41: ( '\\r' )? '\\n' + // InternalTqcl.g:2357:41: ( '\\r' )? '\\n' { - // InternalTqcl.g:2153:41: ( '\\r' )? + // InternalTqcl.g:2357:41: ( '\\r' )? int alt11=2; int LA11_0 = input.LA(1); @@ -977,7 +977,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } switch (alt11) { case 1 : - // InternalTqcl.g:2153:41: '\\r' + // InternalTqcl.g:2357:41: '\\r' { match('\r'); @@ -1009,10 +1009,10 @@ public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2155:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalTqcl.g:2155:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalTqcl.g:2359:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalTqcl.g:2359:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalTqcl.g:2155:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalTqcl.g:2359:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt13=0; loop13: do { @@ -1066,8 +1066,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:2157:16: ( . ) - // InternalTqcl.g:2157:18: . + // InternalTqcl.g:2361:16: ( . ) + // InternalTqcl.g:2361:18: . { matchAny(); @@ -1297,19 +1297,19 @@ public void mTokens() throws RecognitionException { protected DFA14 dfa14 = new DFA14(this); static final String DFA14_eotS = - "\1\uffff\3\34\1\uffff\3\34\1\uffff\4\34\2\uffff\1\34\3\31\2\uffff\3\31\2\uffff\1\34\1\64\1\uffff\3\34\1\uffff\3\34\1\uffff\2\34\1\100\1\101\2\uffff\1\34\7\uffff\1\34\1\uffff\10\34\1\114\1\34\1\116\2\uffff\1\117\2\34\1\122\3\34\1\126\1\34\1\130\1\uffff\1\34\2\uffff\1\132\1\34\1\uffff\3\34\1\uffff\1\34\1\uffff\1\34\1\uffff\3\34\1\144\4\34\1\151\1\uffff\1\152\1\153\1\34\1\155\3\uffff\1\156\2\uffff"; + "\1\uffff\3\34\1\uffff\3\34\1\uffff\3\34\1\uffff\1\34\1\uffff\1\34\3\31\2\uffff\3\31\2\uffff\1\34\1\64\1\uffff\3\34\1\uffff\3\34\1\uffff\2\34\1\100\1\uffff\1\101\1\uffff\1\34\7\uffff\1\34\1\uffff\10\34\1\114\1\34\1\116\2\uffff\1\117\2\34\1\122\3\34\1\126\1\34\1\130\1\uffff\1\34\2\uffff\1\132\1\34\1\uffff\3\34\1\uffff\1\34\1\uffff\1\34\1\uffff\3\34\1\144\4\34\1\151\1\uffff\1\152\1\153\1\34\1\155\3\uffff\1\156\2\uffff"; static final String DFA14_eofS = "\157\uffff"; static final String DFA14_minS = - "\1\0\1\143\1\141\1\151\1\uffff\1\156\2\151\1\uffff\1\145\3\157\2\uffff\1\165\1\101\1\0\1\101\2\uffff\2\0\1\52\2\uffff\1\164\1\60\1\uffff\3\162\1\uffff\1\143\1\142\1\164\1\uffff\1\164\1\156\2\60\2\uffff\1\164\7\uffff\1\157\1\uffff\1\141\1\164\1\145\1\154\1\145\1\157\1\162\1\150\1\60\1\156\1\60\2\uffff\1\60\1\162\1\155\1\60\1\143\1\165\1\162\1\60\1\141\1\60\1\uffff\1\145\2\uffff\1\60\1\145\1\uffff\1\164\1\144\1\164\1\uffff\1\162\1\uffff\1\143\1\uffff\1\164\1\157\1\145\1\60\1\171\1\164\1\145\1\162\1\60\1\uffff\2\60\1\162\1\60\3\uffff\1\60\2\uffff"; + "\1\0\1\143\1\141\1\151\1\uffff\1\156\2\151\1\uffff\1\145\2\157\1\uffff\1\157\1\uffff\1\165\1\101\1\0\1\101\2\uffff\2\0\1\52\2\uffff\1\164\1\60\1\uffff\3\162\1\uffff\1\143\1\142\1\164\1\uffff\1\164\1\156\1\60\1\uffff\1\60\1\uffff\1\164\7\uffff\1\157\1\uffff\1\141\1\164\1\145\1\154\1\145\1\157\1\162\1\150\1\60\1\156\1\60\2\uffff\1\60\1\162\1\155\1\60\1\143\1\165\1\162\1\60\1\141\1\60\1\uffff\1\145\2\uffff\1\60\1\145\1\uffff\1\164\1\144\1\164\1\uffff\1\162\1\uffff\1\143\1\uffff\1\164\1\157\1\145\1\60\1\171\1\164\1\145\1\162\1\60\1\uffff\2\60\1\162\1\60\3\uffff\1\60\2\uffff"; static final String DFA14_maxS = - "\1\uffff\1\163\1\157\1\151\1\uffff\1\156\2\151\1\uffff\1\145\3\157\2\uffff\1\165\1\172\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\1\172\1\uffff\3\162\1\uffff\1\164\1\142\1\164\1\uffff\1\164\1\156\2\172\2\uffff\1\164\7\uffff\1\157\1\uffff\1\141\1\164\1\145\1\154\1\145\1\157\1\162\1\150\1\172\1\156\1\172\2\uffff\1\172\1\162\1\155\1\172\1\143\1\165\1\162\1\172\1\141\1\172\1\uffff\1\145\2\uffff\1\172\1\145\1\uffff\1\164\1\144\1\164\1\uffff\1\162\1\uffff\1\143\1\uffff\1\164\1\157\1\145\1\172\1\171\1\164\1\145\1\162\1\172\1\uffff\2\172\1\162\1\172\3\uffff\1\172\2\uffff"; + "\1\uffff\1\163\1\157\1\151\1\uffff\1\156\2\151\1\uffff\1\145\2\157\1\uffff\1\157\1\uffff\1\165\1\172\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\164\1\172\1\uffff\3\162\1\uffff\1\164\1\142\1\164\1\uffff\1\164\1\156\1\172\1\uffff\1\172\1\uffff\1\164\7\uffff\1\157\1\uffff\1\141\1\164\1\145\1\154\1\145\1\157\1\162\1\150\1\172\1\156\1\172\2\uffff\1\172\1\162\1\155\1\172\1\143\1\165\1\162\1\172\1\141\1\172\1\uffff\1\145\2\uffff\1\172\1\145\1\uffff\1\164\1\144\1\164\1\uffff\1\162\1\uffff\1\143\1\uffff\1\164\1\157\1\145\1\172\1\171\1\164\1\145\1\162\1\172\1\uffff\2\172\1\162\1\172\3\uffff\1\172\2\uffff"; static final String DFA14_acceptS = - "\4\uffff\1\5\3\uffff\1\13\4\uffff\1\20\1\21\4\uffff\1\27\1\30\3\uffff\1\34\1\35\2\uffff\1\27\3\uffff\1\5\3\uffff\1\13\4\uffff\1\20\1\21\1\uffff\1\25\1\26\1\30\1\31\1\32\1\33\1\34\1\uffff\1\11\13\uffff\1\16\1\17\12\uffff\1\14\1\uffff\1\24\1\23\2\uffff\1\3\3\uffff\1\22\1\uffff\1\12\1\uffff\1\1\11\uffff\1\10\4\uffff\1\6\1\7\1\15\1\uffff\1\4\1\2"; + "\4\uffff\1\5\3\uffff\1\13\3\uffff\1\17\1\uffff\1\21\4\uffff\1\27\1\30\3\uffff\1\34\1\35\2\uffff\1\27\3\uffff\1\5\3\uffff\1\13\3\uffff\1\17\1\uffff\1\21\1\uffff\1\25\1\26\1\30\1\31\1\32\1\33\1\34\1\uffff\1\11\13\uffff\1\16\1\20\12\uffff\1\14\1\uffff\1\24\1\23\2\uffff\1\3\3\uffff\1\22\1\uffff\1\12\1\uffff\1\1\11\uffff\1\10\4\uffff\1\6\1\7\1\15\1\uffff\1\4\1\2"; static final String DFA14_specialS = "\1\2\20\uffff\1\1\3\uffff\1\0\1\3\130\uffff}>"; static final String[] DFA14_transitionS = { - "\11\31\2\30\2\31\1\30\22\31\1\30\1\31\1\25\1\31\1\20\2\31\1\26\4\31\1\10\1\31\1\16\1\27\12\24\1\31\1\4\1\21\1\15\3\31\32\23\3\31\1\22\1\23\1\31\1\1\1\23\1\12\1\3\2\23\1\14\1\23\1\5\2\23\1\6\2\23\1\17\1\2\2\23\1\11\1\13\2\23\1\7\3\23\uff85\31", + "\11\31\2\30\2\31\1\30\22\31\1\30\1\31\1\25\1\31\1\20\2\31\1\26\4\31\1\10\1\31\1\14\1\27\12\24\1\31\1\4\1\21\1\16\3\31\32\23\3\31\1\22\1\23\1\31\1\1\1\23\1\12\1\3\2\23\1\15\1\23\1\5\2\23\1\6\2\23\1\17\1\2\2\23\1\11\1\13\2\23\1\7\3\23\uff85\31", "\1\32\17\uffff\1\33", "\1\35\15\uffff\1\36", "\1\37", @@ -1321,8 +1321,8 @@ public void mTokens() throws RecognitionException { "\1\45", "\1\46", "\1\47", - "\1\50", "", + "\1\51", "", "\1\53", "\32\54\4\uffff\1\54\1\uffff\32\54", @@ -1349,8 +1349,8 @@ public void mTokens() throws RecognitionException { "\1\75", "\1\76", "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\17\34\1\77\12\34", - "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34", "", + "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34", "", "\1\102", "", @@ -1504,11 +1504,11 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc else if ( (LA14_0=='t') ) {s = 11;} - else if ( (LA14_0=='g') ) {s = 12;} + else if ( (LA14_0=='.') ) {s = 12;} - else if ( (LA14_0=='=') ) {s = 13;} + else if ( (LA14_0=='g') ) {s = 13;} - else if ( (LA14_0=='.') ) {s = 14;} + else if ( (LA14_0=='=') ) {s = 14;} else if ( (LA14_0=='o') ) {s = 15;} diff --git a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclParser.java b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclParser.java index 7be4c480..3712f4e4 100644 --- a/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclParser.java +++ b/org.eclipse.triquetrum.commands.xtext.ide/src/main/java-gen/org/eclipse/triquetrum/commands/ide/contentassist/antlr/internal/InternalTqclParser.java @@ -34,7 +34,7 @@ @SuppressWarnings("all") public class InternalTqclParser extends AbstractInternalContentAssistParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_PARAMETER_NAME", "RULE_STRING", "RULE_ID", "RULE_ENTITY_CLASS", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'actor'", "'parameter'", "'port'", "'director'", "';'", "'include'", "'library'", "'insert'", "'as'", "'with'", "','", "'set'", "'connect'", "'to'", "'go'", "'='", "'.'", "'into'", "'out'", "'top'" + "", "", "", "", "RULE_PARAMETER_NAME", "RULE_STRING", "RULE_ID", "RULE_ENTITY_CLASS", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'actor'", "'parameter'", "'port'", "'director'", "';'", "'include'", "'library'", "'insert'", "'as'", "'with'", "','", "'set'", "'connect'", "'to'", "'.'", "'go'", "'='", "'into'", "'out'", "'top'" }; public static final int RULE_STRING=5; public static final int RULE_SL_COMMENT=10; @@ -179,12 +179,166 @@ public final void ruleTriquetrumScript() throws RecognitionException { // $ANTLR end "ruleTriquetrumScript" + // $ANTLR start "entryRuleCompositeCommand" + // InternalTqcl.g:87:1: entryRuleCompositeCommand : ruleCompositeCommand EOF ; + public final void entryRuleCompositeCommand() throws RecognitionException { + try { + // InternalTqcl.g:88:1: ( ruleCompositeCommand EOF ) + // InternalTqcl.g:89:1: ruleCompositeCommand EOF + { + before(grammarAccess.getCompositeCommandRule()); + pushFollow(FOLLOW_1); + ruleCompositeCommand(); + + state._fsp--; + + after(grammarAccess.getCompositeCommandRule()); + match(input,EOF,FOLLOW_2); + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ; + } + // $ANTLR end "entryRuleCompositeCommand" + + + // $ANTLR start "ruleCompositeCommand" + // InternalTqcl.g:96:1: ruleCompositeCommand : ( ( rule__CompositeCommand__Group__0 ) ) ; + public final void ruleCompositeCommand() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:100:2: ( ( ( rule__CompositeCommand__Group__0 ) ) ) + // InternalTqcl.g:101:2: ( ( rule__CompositeCommand__Group__0 ) ) + { + // InternalTqcl.g:101:2: ( ( rule__CompositeCommand__Group__0 ) ) + // InternalTqcl.g:102:3: ( rule__CompositeCommand__Group__0 ) + { + before(grammarAccess.getCompositeCommandAccess().getGroup()); + // InternalTqcl.g:103:3: ( rule__CompositeCommand__Group__0 ) + // InternalTqcl.g:103:4: rule__CompositeCommand__Group__0 + { + pushFollow(FOLLOW_2); + rule__CompositeCommand__Group__0(); + + state._fsp--; + + + } + + after(grammarAccess.getCompositeCommandAccess().getGroup()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "ruleCompositeCommand" + + + // $ANTLR start "entryRuleSimpleCommand" + // InternalTqcl.g:112:1: entryRuleSimpleCommand : ruleSimpleCommand EOF ; + public final void entryRuleSimpleCommand() throws RecognitionException { + try { + // InternalTqcl.g:113:1: ( ruleSimpleCommand EOF ) + // InternalTqcl.g:114:1: ruleSimpleCommand EOF + { + before(grammarAccess.getSimpleCommandRule()); + pushFollow(FOLLOW_1); + ruleSimpleCommand(); + + state._fsp--; + + after(grammarAccess.getSimpleCommandRule()); + match(input,EOF,FOLLOW_2); + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ; + } + // $ANTLR end "entryRuleSimpleCommand" + + + // $ANTLR start "ruleSimpleCommand" + // InternalTqcl.g:121:1: ruleSimpleCommand : ( ( rule__SimpleCommand__Group__0 ) ) ; + public final void ruleSimpleCommand() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:125:2: ( ( ( rule__SimpleCommand__Group__0 ) ) ) + // InternalTqcl.g:126:2: ( ( rule__SimpleCommand__Group__0 ) ) + { + // InternalTqcl.g:126:2: ( ( rule__SimpleCommand__Group__0 ) ) + // InternalTqcl.g:127:3: ( rule__SimpleCommand__Group__0 ) + { + before(grammarAccess.getSimpleCommandAccess().getGroup()); + // InternalTqcl.g:128:3: ( rule__SimpleCommand__Group__0 ) + // InternalTqcl.g:128:4: rule__SimpleCommand__Group__0 + { + pushFollow(FOLLOW_2); + rule__SimpleCommand__Group__0(); + + state._fsp--; + + + } + + after(grammarAccess.getSimpleCommandAccess().getGroup()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "ruleSimpleCommand" + + // $ANTLR start "entryRuleCommand" - // InternalTqcl.g:87:1: entryRuleCommand : ruleCommand EOF ; + // InternalTqcl.g:137:1: entryRuleCommand : ruleCommand EOF ; public final void entryRuleCommand() throws RecognitionException { try { - // InternalTqcl.g:88:1: ( ruleCommand EOF ) - // InternalTqcl.g:89:1: ruleCommand EOF + // InternalTqcl.g:138:1: ( ruleCommand EOF ) + // InternalTqcl.g:139:1: ruleCommand EOF { before(grammarAccess.getCommandRule()); pushFollow(FOLLOW_1); @@ -210,31 +364,31 @@ public final void entryRuleCommand() throws RecognitionException { // $ANTLR start "ruleCommand" - // InternalTqcl.g:96:1: ruleCommand : ( ( rule__Command__Group__0 ) ) ; + // InternalTqcl.g:146:1: ruleCommand : ( ( rule__Command__Alternatives ) ) ; public final void ruleCommand() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:100:2: ( ( ( rule__Command__Group__0 ) ) ) - // InternalTqcl.g:101:2: ( ( rule__Command__Group__0 ) ) + // InternalTqcl.g:150:2: ( ( ( rule__Command__Alternatives ) ) ) + // InternalTqcl.g:151:2: ( ( rule__Command__Alternatives ) ) { - // InternalTqcl.g:101:2: ( ( rule__Command__Group__0 ) ) - // InternalTqcl.g:102:3: ( rule__Command__Group__0 ) + // InternalTqcl.g:151:2: ( ( rule__Command__Alternatives ) ) + // InternalTqcl.g:152:3: ( rule__Command__Alternatives ) { - before(grammarAccess.getCommandAccess().getGroup()); - // InternalTqcl.g:103:3: ( rule__Command__Group__0 ) - // InternalTqcl.g:103:4: rule__Command__Group__0 + before(grammarAccess.getCommandAccess().getAlternatives()); + // InternalTqcl.g:153:3: ( rule__Command__Alternatives ) + // InternalTqcl.g:153:4: rule__Command__Alternatives { pushFollow(FOLLOW_2); - rule__Command__Group__0(); + rule__Command__Alternatives(); state._fsp--; } - after(grammarAccess.getCommandAccess().getGroup()); + after(grammarAccess.getCommandAccess().getAlternatives()); } @@ -257,11 +411,11 @@ public final void ruleCommand() throws RecognitionException { // $ANTLR start "entryRuleInclude" - // InternalTqcl.g:112:1: entryRuleInclude : ruleInclude EOF ; + // InternalTqcl.g:162:1: entryRuleInclude : ruleInclude EOF ; public final void entryRuleInclude() throws RecognitionException { try { - // InternalTqcl.g:113:1: ( ruleInclude EOF ) - // InternalTqcl.g:114:1: ruleInclude EOF + // InternalTqcl.g:163:1: ( ruleInclude EOF ) + // InternalTqcl.g:164:1: ruleInclude EOF { before(grammarAccess.getIncludeRule()); pushFollow(FOLLOW_1); @@ -287,21 +441,21 @@ public final void entryRuleInclude() throws RecognitionException { // $ANTLR start "ruleInclude" - // InternalTqcl.g:121:1: ruleInclude : ( ( rule__Include__Group__0 ) ) ; + // InternalTqcl.g:171:1: ruleInclude : ( ( rule__Include__Group__0 ) ) ; public final void ruleInclude() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:125:2: ( ( ( rule__Include__Group__0 ) ) ) - // InternalTqcl.g:126:2: ( ( rule__Include__Group__0 ) ) + // InternalTqcl.g:175:2: ( ( ( rule__Include__Group__0 ) ) ) + // InternalTqcl.g:176:2: ( ( rule__Include__Group__0 ) ) { - // InternalTqcl.g:126:2: ( ( rule__Include__Group__0 ) ) - // InternalTqcl.g:127:3: ( rule__Include__Group__0 ) + // InternalTqcl.g:176:2: ( ( rule__Include__Group__0 ) ) + // InternalTqcl.g:177:3: ( rule__Include__Group__0 ) { before(grammarAccess.getIncludeAccess().getGroup()); - // InternalTqcl.g:128:3: ( rule__Include__Group__0 ) - // InternalTqcl.g:128:4: rule__Include__Group__0 + // InternalTqcl.g:178:3: ( rule__Include__Group__0 ) + // InternalTqcl.g:178:4: rule__Include__Group__0 { pushFollow(FOLLOW_2); rule__Include__Group__0(); @@ -334,11 +488,11 @@ public final void ruleInclude() throws RecognitionException { // $ANTLR start "entryRuleLibrary" - // InternalTqcl.g:137:1: entryRuleLibrary : ruleLibrary EOF ; + // InternalTqcl.g:187:1: entryRuleLibrary : ruleLibrary EOF ; public final void entryRuleLibrary() throws RecognitionException { try { - // InternalTqcl.g:138:1: ( ruleLibrary EOF ) - // InternalTqcl.g:139:1: ruleLibrary EOF + // InternalTqcl.g:188:1: ( ruleLibrary EOF ) + // InternalTqcl.g:189:1: ruleLibrary EOF { before(grammarAccess.getLibraryRule()); pushFollow(FOLLOW_1); @@ -364,21 +518,21 @@ public final void entryRuleLibrary() throws RecognitionException { // $ANTLR start "ruleLibrary" - // InternalTqcl.g:146:1: ruleLibrary : ( ( rule__Library__Group__0 ) ) ; + // InternalTqcl.g:196:1: ruleLibrary : ( ( rule__Library__Group__0 ) ) ; public final void ruleLibrary() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:150:2: ( ( ( rule__Library__Group__0 ) ) ) - // InternalTqcl.g:151:2: ( ( rule__Library__Group__0 ) ) + // InternalTqcl.g:200:2: ( ( ( rule__Library__Group__0 ) ) ) + // InternalTqcl.g:201:2: ( ( rule__Library__Group__0 ) ) { - // InternalTqcl.g:151:2: ( ( rule__Library__Group__0 ) ) - // InternalTqcl.g:152:3: ( rule__Library__Group__0 ) + // InternalTqcl.g:201:2: ( ( rule__Library__Group__0 ) ) + // InternalTqcl.g:202:3: ( rule__Library__Group__0 ) { before(grammarAccess.getLibraryAccess().getGroup()); - // InternalTqcl.g:153:3: ( rule__Library__Group__0 ) - // InternalTqcl.g:153:4: rule__Library__Group__0 + // InternalTqcl.g:203:3: ( rule__Library__Group__0 ) + // InternalTqcl.g:203:4: rule__Library__Group__0 { pushFollow(FOLLOW_2); rule__Library__Group__0(); @@ -411,11 +565,11 @@ public final void ruleLibrary() throws RecognitionException { // $ANTLR start "entryRuleInsert" - // InternalTqcl.g:162:1: entryRuleInsert : ruleInsert EOF ; + // InternalTqcl.g:212:1: entryRuleInsert : ruleInsert EOF ; public final void entryRuleInsert() throws RecognitionException { try { - // InternalTqcl.g:163:1: ( ruleInsert EOF ) - // InternalTqcl.g:164:1: ruleInsert EOF + // InternalTqcl.g:213:1: ( ruleInsert EOF ) + // InternalTqcl.g:214:1: ruleInsert EOF { before(grammarAccess.getInsertRule()); pushFollow(FOLLOW_1); @@ -441,21 +595,21 @@ public final void entryRuleInsert() throws RecognitionException { // $ANTLR start "ruleInsert" - // InternalTqcl.g:171:1: ruleInsert : ( ( rule__Insert__Group__0 ) ) ; + // InternalTqcl.g:221:1: ruleInsert : ( ( rule__Insert__Group__0 ) ) ; public final void ruleInsert() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:175:2: ( ( ( rule__Insert__Group__0 ) ) ) - // InternalTqcl.g:176:2: ( ( rule__Insert__Group__0 ) ) + // InternalTqcl.g:225:2: ( ( ( rule__Insert__Group__0 ) ) ) + // InternalTqcl.g:226:2: ( ( rule__Insert__Group__0 ) ) { - // InternalTqcl.g:176:2: ( ( rule__Insert__Group__0 ) ) - // InternalTqcl.g:177:3: ( rule__Insert__Group__0 ) + // InternalTqcl.g:226:2: ( ( rule__Insert__Group__0 ) ) + // InternalTqcl.g:227:3: ( rule__Insert__Group__0 ) { before(grammarAccess.getInsertAccess().getGroup()); - // InternalTqcl.g:178:3: ( rule__Insert__Group__0 ) - // InternalTqcl.g:178:4: rule__Insert__Group__0 + // InternalTqcl.g:228:3: ( rule__Insert__Group__0 ) + // InternalTqcl.g:228:4: rule__Insert__Group__0 { pushFollow(FOLLOW_2); rule__Insert__Group__0(); @@ -488,11 +642,11 @@ public final void ruleInsert() throws RecognitionException { // $ANTLR start "entryRuleSet" - // InternalTqcl.g:187:1: entryRuleSet : ruleSet EOF ; + // InternalTqcl.g:237:1: entryRuleSet : ruleSet EOF ; public final void entryRuleSet() throws RecognitionException { try { - // InternalTqcl.g:188:1: ( ruleSet EOF ) - // InternalTqcl.g:189:1: ruleSet EOF + // InternalTqcl.g:238:1: ( ruleSet EOF ) + // InternalTqcl.g:239:1: ruleSet EOF { before(grammarAccess.getSetRule()); pushFollow(FOLLOW_1); @@ -518,21 +672,21 @@ public final void entryRuleSet() throws RecognitionException { // $ANTLR start "ruleSet" - // InternalTqcl.g:196:1: ruleSet : ( ( rule__Set__Group__0 ) ) ; + // InternalTqcl.g:246:1: ruleSet : ( ( rule__Set__Group__0 ) ) ; public final void ruleSet() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:200:2: ( ( ( rule__Set__Group__0 ) ) ) - // InternalTqcl.g:201:2: ( ( rule__Set__Group__0 ) ) + // InternalTqcl.g:250:2: ( ( ( rule__Set__Group__0 ) ) ) + // InternalTqcl.g:251:2: ( ( rule__Set__Group__0 ) ) { - // InternalTqcl.g:201:2: ( ( rule__Set__Group__0 ) ) - // InternalTqcl.g:202:3: ( rule__Set__Group__0 ) + // InternalTqcl.g:251:2: ( ( rule__Set__Group__0 ) ) + // InternalTqcl.g:252:3: ( rule__Set__Group__0 ) { before(grammarAccess.getSetAccess().getGroup()); - // InternalTqcl.g:203:3: ( rule__Set__Group__0 ) - // InternalTqcl.g:203:4: rule__Set__Group__0 + // InternalTqcl.g:253:3: ( rule__Set__Group__0 ) + // InternalTqcl.g:253:4: rule__Set__Group__0 { pushFollow(FOLLOW_2); rule__Set__Group__0(); @@ -565,11 +719,11 @@ public final void ruleSet() throws RecognitionException { // $ANTLR start "entryRuleConnect" - // InternalTqcl.g:212:1: entryRuleConnect : ruleConnect EOF ; + // InternalTqcl.g:262:1: entryRuleConnect : ruleConnect EOF ; public final void entryRuleConnect() throws RecognitionException { try { - // InternalTqcl.g:213:1: ( ruleConnect EOF ) - // InternalTqcl.g:214:1: ruleConnect EOF + // InternalTqcl.g:263:1: ( ruleConnect EOF ) + // InternalTqcl.g:264:1: ruleConnect EOF { before(grammarAccess.getConnectRule()); pushFollow(FOLLOW_1); @@ -595,21 +749,21 @@ public final void entryRuleConnect() throws RecognitionException { // $ANTLR start "ruleConnect" - // InternalTqcl.g:221:1: ruleConnect : ( ( rule__Connect__Group__0 ) ) ; + // InternalTqcl.g:271:1: ruleConnect : ( ( rule__Connect__Group__0 ) ) ; public final void ruleConnect() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:225:2: ( ( ( rule__Connect__Group__0 ) ) ) - // InternalTqcl.g:226:2: ( ( rule__Connect__Group__0 ) ) + // InternalTqcl.g:275:2: ( ( ( rule__Connect__Group__0 ) ) ) + // InternalTqcl.g:276:2: ( ( rule__Connect__Group__0 ) ) { - // InternalTqcl.g:226:2: ( ( rule__Connect__Group__0 ) ) - // InternalTqcl.g:227:3: ( rule__Connect__Group__0 ) + // InternalTqcl.g:276:2: ( ( rule__Connect__Group__0 ) ) + // InternalTqcl.g:277:3: ( rule__Connect__Group__0 ) { before(grammarAccess.getConnectAccess().getGroup()); - // InternalTqcl.g:228:3: ( rule__Connect__Group__0 ) - // InternalTqcl.g:228:4: rule__Connect__Group__0 + // InternalTqcl.g:278:3: ( rule__Connect__Group__0 ) + // InternalTqcl.g:278:4: rule__Connect__Group__0 { pushFollow(FOLLOW_2); rule__Connect__Group__0(); @@ -641,12 +795,89 @@ public final void ruleConnect() throws RecognitionException { // $ANTLR end "ruleConnect" + // $ANTLR start "entryRuleConnectionPort" + // InternalTqcl.g:287:1: entryRuleConnectionPort : ruleConnectionPort EOF ; + public final void entryRuleConnectionPort() throws RecognitionException { + try { + // InternalTqcl.g:288:1: ( ruleConnectionPort EOF ) + // InternalTqcl.g:289:1: ruleConnectionPort EOF + { + before(grammarAccess.getConnectionPortRule()); + pushFollow(FOLLOW_1); + ruleConnectionPort(); + + state._fsp--; + + after(grammarAccess.getConnectionPortRule()); + match(input,EOF,FOLLOW_2); + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + } + return ; + } + // $ANTLR end "entryRuleConnectionPort" + + + // $ANTLR start "ruleConnectionPort" + // InternalTqcl.g:296:1: ruleConnectionPort : ( ( rule__ConnectionPort__Group__0 ) ) ; + public final void ruleConnectionPort() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:300:2: ( ( ( rule__ConnectionPort__Group__0 ) ) ) + // InternalTqcl.g:301:2: ( ( rule__ConnectionPort__Group__0 ) ) + { + // InternalTqcl.g:301:2: ( ( rule__ConnectionPort__Group__0 ) ) + // InternalTqcl.g:302:3: ( rule__ConnectionPort__Group__0 ) + { + before(grammarAccess.getConnectionPortAccess().getGroup()); + // InternalTqcl.g:303:3: ( rule__ConnectionPort__Group__0 ) + // InternalTqcl.g:303:4: rule__ConnectionPort__Group__0 + { + pushFollow(FOLLOW_2); + rule__ConnectionPort__Group__0(); + + state._fsp--; + + + } + + after(grammarAccess.getConnectionPortAccess().getGroup()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "ruleConnectionPort" + + // $ANTLR start "entryRuleGoInto" - // InternalTqcl.g:237:1: entryRuleGoInto : ruleGoInto EOF ; + // InternalTqcl.g:312:1: entryRuleGoInto : ruleGoInto EOF ; public final void entryRuleGoInto() throws RecognitionException { try { - // InternalTqcl.g:238:1: ( ruleGoInto EOF ) - // InternalTqcl.g:239:1: ruleGoInto EOF + // InternalTqcl.g:313:1: ( ruleGoInto EOF ) + // InternalTqcl.g:314:1: ruleGoInto EOF { before(grammarAccess.getGoIntoRule()); pushFollow(FOLLOW_1); @@ -672,21 +903,21 @@ public final void entryRuleGoInto() throws RecognitionException { // $ANTLR start "ruleGoInto" - // InternalTqcl.g:246:1: ruleGoInto : ( ( rule__GoInto__Group__0 ) ) ; + // InternalTqcl.g:321:1: ruleGoInto : ( ( rule__GoInto__Group__0 ) ) ; public final void ruleGoInto() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:250:2: ( ( ( rule__GoInto__Group__0 ) ) ) - // InternalTqcl.g:251:2: ( ( rule__GoInto__Group__0 ) ) + // InternalTqcl.g:325:2: ( ( ( rule__GoInto__Group__0 ) ) ) + // InternalTqcl.g:326:2: ( ( rule__GoInto__Group__0 ) ) { - // InternalTqcl.g:251:2: ( ( rule__GoInto__Group__0 ) ) - // InternalTqcl.g:252:3: ( rule__GoInto__Group__0 ) + // InternalTqcl.g:326:2: ( ( rule__GoInto__Group__0 ) ) + // InternalTqcl.g:327:3: ( rule__GoInto__Group__0 ) { before(grammarAccess.getGoIntoAccess().getGroup()); - // InternalTqcl.g:253:3: ( rule__GoInto__Group__0 ) - // InternalTqcl.g:253:4: rule__GoInto__Group__0 + // InternalTqcl.g:328:3: ( rule__GoInto__Group__0 ) + // InternalTqcl.g:328:4: rule__GoInto__Group__0 { pushFollow(FOLLOW_2); rule__GoInto__Group__0(); @@ -719,11 +950,11 @@ public final void ruleGoInto() throws RecognitionException { // $ANTLR start "entryRuleGoOut" - // InternalTqcl.g:262:1: entryRuleGoOut : ruleGoOut EOF ; + // InternalTqcl.g:337:1: entryRuleGoOut : ruleGoOut EOF ; public final void entryRuleGoOut() throws RecognitionException { try { - // InternalTqcl.g:263:1: ( ruleGoOut EOF ) - // InternalTqcl.g:264:1: ruleGoOut EOF + // InternalTqcl.g:338:1: ( ruleGoOut EOF ) + // InternalTqcl.g:339:1: ruleGoOut EOF { before(grammarAccess.getGoOutRule()); pushFollow(FOLLOW_1); @@ -749,21 +980,21 @@ public final void entryRuleGoOut() throws RecognitionException { // $ANTLR start "ruleGoOut" - // InternalTqcl.g:271:1: ruleGoOut : ( ( rule__GoOut__Group__0 ) ) ; + // InternalTqcl.g:346:1: ruleGoOut : ( ( rule__GoOut__Group__0 ) ) ; public final void ruleGoOut() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:275:2: ( ( ( rule__GoOut__Group__0 ) ) ) - // InternalTqcl.g:276:2: ( ( rule__GoOut__Group__0 ) ) + // InternalTqcl.g:350:2: ( ( ( rule__GoOut__Group__0 ) ) ) + // InternalTqcl.g:351:2: ( ( rule__GoOut__Group__0 ) ) { - // InternalTqcl.g:276:2: ( ( rule__GoOut__Group__0 ) ) - // InternalTqcl.g:277:3: ( rule__GoOut__Group__0 ) + // InternalTqcl.g:351:2: ( ( rule__GoOut__Group__0 ) ) + // InternalTqcl.g:352:3: ( rule__GoOut__Group__0 ) { before(grammarAccess.getGoOutAccess().getGroup()); - // InternalTqcl.g:278:3: ( rule__GoOut__Group__0 ) - // InternalTqcl.g:278:4: rule__GoOut__Group__0 + // InternalTqcl.g:353:3: ( rule__GoOut__Group__0 ) + // InternalTqcl.g:353:4: rule__GoOut__Group__0 { pushFollow(FOLLOW_2); rule__GoOut__Group__0(); @@ -796,11 +1027,11 @@ public final void ruleGoOut() throws RecognitionException { // $ANTLR start "entryRuleGoTop" - // InternalTqcl.g:287:1: entryRuleGoTop : ruleGoTop EOF ; + // InternalTqcl.g:362:1: entryRuleGoTop : ruleGoTop EOF ; public final void entryRuleGoTop() throws RecognitionException { try { - // InternalTqcl.g:288:1: ( ruleGoTop EOF ) - // InternalTqcl.g:289:1: ruleGoTop EOF + // InternalTqcl.g:363:1: ( ruleGoTop EOF ) + // InternalTqcl.g:364:1: ruleGoTop EOF { before(grammarAccess.getGoTopRule()); pushFollow(FOLLOW_1); @@ -826,21 +1057,21 @@ public final void entryRuleGoTop() throws RecognitionException { // $ANTLR start "ruleGoTop" - // InternalTqcl.g:296:1: ruleGoTop : ( ( rule__GoTop__Group__0 ) ) ; + // InternalTqcl.g:371:1: ruleGoTop : ( ( rule__GoTop__Group__0 ) ) ; public final void ruleGoTop() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:300:2: ( ( ( rule__GoTop__Group__0 ) ) ) - // InternalTqcl.g:301:2: ( ( rule__GoTop__Group__0 ) ) + // InternalTqcl.g:375:2: ( ( ( rule__GoTop__Group__0 ) ) ) + // InternalTqcl.g:376:2: ( ( rule__GoTop__Group__0 ) ) { - // InternalTqcl.g:301:2: ( ( rule__GoTop__Group__0 ) ) - // InternalTqcl.g:302:3: ( rule__GoTop__Group__0 ) + // InternalTqcl.g:376:2: ( ( rule__GoTop__Group__0 ) ) + // InternalTqcl.g:377:3: ( rule__GoTop__Group__0 ) { before(grammarAccess.getGoTopAccess().getGroup()); - // InternalTqcl.g:303:3: ( rule__GoTop__Group__0 ) - // InternalTqcl.g:303:4: rule__GoTop__Group__0 + // InternalTqcl.g:378:3: ( rule__GoTop__Group__0 ) + // InternalTqcl.g:378:4: rule__GoTop__Group__0 { pushFollow(FOLLOW_2); rule__GoTop__Group__0(); @@ -873,11 +1104,11 @@ public final void ruleGoTop() throws RecognitionException { // $ANTLR start "entryRuleParameter" - // InternalTqcl.g:312:1: entryRuleParameter : ruleParameter EOF ; + // InternalTqcl.g:387:1: entryRuleParameter : ruleParameter EOF ; public final void entryRuleParameter() throws RecognitionException { try { - // InternalTqcl.g:313:1: ( ruleParameter EOF ) - // InternalTqcl.g:314:1: ruleParameter EOF + // InternalTqcl.g:388:1: ( ruleParameter EOF ) + // InternalTqcl.g:389:1: ruleParameter EOF { before(grammarAccess.getParameterRule()); pushFollow(FOLLOW_1); @@ -903,21 +1134,21 @@ public final void entryRuleParameter() throws RecognitionException { // $ANTLR start "ruleParameter" - // InternalTqcl.g:321:1: ruleParameter : ( ( rule__Parameter__Group__0 ) ) ; + // InternalTqcl.g:396:1: ruleParameter : ( ( rule__Parameter__Group__0 ) ) ; public final void ruleParameter() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:325:2: ( ( ( rule__Parameter__Group__0 ) ) ) - // InternalTqcl.g:326:2: ( ( rule__Parameter__Group__0 ) ) + // InternalTqcl.g:400:2: ( ( ( rule__Parameter__Group__0 ) ) ) + // InternalTqcl.g:401:2: ( ( rule__Parameter__Group__0 ) ) { - // InternalTqcl.g:326:2: ( ( rule__Parameter__Group__0 ) ) - // InternalTqcl.g:327:3: ( rule__Parameter__Group__0 ) + // InternalTqcl.g:401:2: ( ( rule__Parameter__Group__0 ) ) + // InternalTqcl.g:402:3: ( rule__Parameter__Group__0 ) { before(grammarAccess.getParameterAccess().getGroup()); - // InternalTqcl.g:328:3: ( rule__Parameter__Group__0 ) - // InternalTqcl.g:328:4: rule__Parameter__Group__0 + // InternalTqcl.g:403:3: ( rule__Parameter__Group__0 ) + // InternalTqcl.g:403:4: rule__Parameter__Group__0 { pushFollow(FOLLOW_2); rule__Parameter__Group__0(); @@ -950,11 +1181,11 @@ public final void ruleParameter() throws RecognitionException { // $ANTLR start "entryRuleParameter_id" - // InternalTqcl.g:337:1: entryRuleParameter_id : ruleParameter_id EOF ; + // InternalTqcl.g:412:1: entryRuleParameter_id : ruleParameter_id EOF ; public final void entryRuleParameter_id() throws RecognitionException { try { - // InternalTqcl.g:338:1: ( ruleParameter_id EOF ) - // InternalTqcl.g:339:1: ruleParameter_id EOF + // InternalTqcl.g:413:1: ( ruleParameter_id EOF ) + // InternalTqcl.g:414:1: ruleParameter_id EOF { before(grammarAccess.getParameter_idRule()); pushFollow(FOLLOW_1); @@ -980,21 +1211,21 @@ public final void entryRuleParameter_id() throws RecognitionException { // $ANTLR start "ruleParameter_id" - // InternalTqcl.g:346:1: ruleParameter_id : ( ( rule__Parameter_id__Alternatives ) ) ; + // InternalTqcl.g:421:1: ruleParameter_id : ( ( rule__Parameter_id__Alternatives ) ) ; public final void ruleParameter_id() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:350:2: ( ( ( rule__Parameter_id__Alternatives ) ) ) - // InternalTqcl.g:351:2: ( ( rule__Parameter_id__Alternatives ) ) + // InternalTqcl.g:425:2: ( ( ( rule__Parameter_id__Alternatives ) ) ) + // InternalTqcl.g:426:2: ( ( rule__Parameter_id__Alternatives ) ) { - // InternalTqcl.g:351:2: ( ( rule__Parameter_id__Alternatives ) ) - // InternalTqcl.g:352:3: ( rule__Parameter_id__Alternatives ) + // InternalTqcl.g:426:2: ( ( rule__Parameter_id__Alternatives ) ) + // InternalTqcl.g:427:3: ( rule__Parameter_id__Alternatives ) { before(grammarAccess.getParameter_idAccess().getAlternatives()); - // InternalTqcl.g:353:3: ( rule__Parameter_id__Alternatives ) - // InternalTqcl.g:353:4: rule__Parameter_id__Alternatives + // InternalTqcl.g:428:3: ( rule__Parameter_id__Alternatives ) + // InternalTqcl.g:428:4: rule__Parameter_id__Alternatives { pushFollow(FOLLOW_2); rule__Parameter_id__Alternatives(); @@ -1027,11 +1258,11 @@ public final void ruleParameter_id() throws RecognitionException { // $ANTLR start "entryRuleNamedObj" - // InternalTqcl.g:362:1: entryRuleNamedObj : ruleNamedObj EOF ; + // InternalTqcl.g:437:1: entryRuleNamedObj : ruleNamedObj EOF ; public final void entryRuleNamedObj() throws RecognitionException { try { - // InternalTqcl.g:363:1: ( ruleNamedObj EOF ) - // InternalTqcl.g:364:1: ruleNamedObj EOF + // InternalTqcl.g:438:1: ( ruleNamedObj EOF ) + // InternalTqcl.g:439:1: ruleNamedObj EOF { before(grammarAccess.getNamedObjRule()); pushFollow(FOLLOW_1); @@ -1057,21 +1288,21 @@ public final void entryRuleNamedObj() throws RecognitionException { // $ANTLR start "ruleNamedObj" - // InternalTqcl.g:371:1: ruleNamedObj : ( ( rule__NamedObj__Alternatives ) ) ; + // InternalTqcl.g:446:1: ruleNamedObj : ( ( rule__NamedObj__Alternatives ) ) ; public final void ruleNamedObj() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:375:2: ( ( ( rule__NamedObj__Alternatives ) ) ) - // InternalTqcl.g:376:2: ( ( rule__NamedObj__Alternatives ) ) + // InternalTqcl.g:450:2: ( ( ( rule__NamedObj__Alternatives ) ) ) + // InternalTqcl.g:451:2: ( ( rule__NamedObj__Alternatives ) ) { - // InternalTqcl.g:376:2: ( ( rule__NamedObj__Alternatives ) ) - // InternalTqcl.g:377:3: ( rule__NamedObj__Alternatives ) + // InternalTqcl.g:451:2: ( ( rule__NamedObj__Alternatives ) ) + // InternalTqcl.g:452:3: ( rule__NamedObj__Alternatives ) { before(grammarAccess.getNamedObjAccess().getAlternatives()); - // InternalTqcl.g:378:3: ( rule__NamedObj__Alternatives ) - // InternalTqcl.g:378:4: rule__NamedObj__Alternatives + // InternalTqcl.g:453:3: ( rule__NamedObj__Alternatives ) + // InternalTqcl.g:453:4: rule__NamedObj__Alternatives { pushFollow(FOLLOW_2); rule__NamedObj__Alternatives(); @@ -1103,62 +1334,32 @@ public final void ruleNamedObj() throws RecognitionException { // $ANTLR end "ruleNamedObj" - // $ANTLR start "entryRuleConnectionPort" - // InternalTqcl.g:387:1: entryRuleConnectionPort : ruleConnectionPort EOF ; - public final void entryRuleConnectionPort() throws RecognitionException { - try { - // InternalTqcl.g:388:1: ( ruleConnectionPort EOF ) - // InternalTqcl.g:389:1: ruleConnectionPort EOF - { - before(grammarAccess.getConnectionPortRule()); - pushFollow(FOLLOW_1); - ruleConnectionPort(); - - state._fsp--; - - after(grammarAccess.getConnectionPortRule()); - match(input,EOF,FOLLOW_2); - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - } - return ; - } - // $ANTLR end "entryRuleConnectionPort" - - - // $ANTLR start "ruleConnectionPort" - // InternalTqcl.g:396:1: ruleConnectionPort : ( ( rule__ConnectionPort__Group__0 ) ) ; - public final void ruleConnectionPort() throws RecognitionException { + // $ANTLR start "ruleCategory" + // InternalTqcl.g:462:1: ruleCategory : ( ( rule__Category__Alternatives ) ) ; + public final void ruleCategory() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:400:2: ( ( ( rule__ConnectionPort__Group__0 ) ) ) - // InternalTqcl.g:401:2: ( ( rule__ConnectionPort__Group__0 ) ) + // InternalTqcl.g:466:1: ( ( ( rule__Category__Alternatives ) ) ) + // InternalTqcl.g:467:2: ( ( rule__Category__Alternatives ) ) { - // InternalTqcl.g:401:2: ( ( rule__ConnectionPort__Group__0 ) ) - // InternalTqcl.g:402:3: ( rule__ConnectionPort__Group__0 ) + // InternalTqcl.g:467:2: ( ( rule__Category__Alternatives ) ) + // InternalTqcl.g:468:3: ( rule__Category__Alternatives ) { - before(grammarAccess.getConnectionPortAccess().getGroup()); - // InternalTqcl.g:403:3: ( rule__ConnectionPort__Group__0 ) - // InternalTqcl.g:403:4: rule__ConnectionPort__Group__0 + before(grammarAccess.getCategoryAccess().getAlternatives()); + // InternalTqcl.g:469:3: ( rule__Category__Alternatives ) + // InternalTqcl.g:469:4: rule__Category__Alternatives { pushFollow(FOLLOW_2); - rule__ConnectionPort__Group__0(); + rule__Category__Alternatives(); state._fsp--; } - after(grammarAccess.getConnectionPortAccess().getGroup()); + after(grammarAccess.getCategoryAccess().getAlternatives()); } @@ -1177,134 +1378,149 @@ public final void ruleConnectionPort() throws RecognitionException { } return ; } - // $ANTLR end "ruleConnectionPort" + // $ANTLR end "ruleCategory" - // $ANTLR start "ruleCategory" - // InternalTqcl.g:412:1: ruleCategory : ( ( rule__Category__Alternatives ) ) ; - public final void ruleCategory() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__EndAlternatives_2_0" + // InternalTqcl.g:477:1: rule__CompositeCommand__EndAlternatives_2_0 : ( ( ruleGoOut ) | ( ruleGoTop ) ); + public final void rule__CompositeCommand__EndAlternatives_2_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:416:1: ( ( ( rule__Category__Alternatives ) ) ) - // InternalTqcl.g:417:2: ( ( rule__Category__Alternatives ) ) - { - // InternalTqcl.g:417:2: ( ( rule__Category__Alternatives ) ) - // InternalTqcl.g:418:3: ( rule__Category__Alternatives ) - { - before(grammarAccess.getCategoryAccess().getAlternatives()); - // InternalTqcl.g:419:3: ( rule__Category__Alternatives ) - // InternalTqcl.g:419:4: rule__Category__Alternatives - { - pushFollow(FOLLOW_2); - rule__Category__Alternatives(); + // InternalTqcl.g:481:1: ( ( ruleGoOut ) | ( ruleGoTop ) ) + int alt1=2; + int LA1_0 = input.LA(1); - state._fsp--; + if ( (LA1_0==28) ) { + int LA1_1 = input.LA(2); + if ( (LA1_1==32) ) { + alt1=2; + } + else if ( (LA1_1==31) ) { + alt1=1; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 1, 1, input); + throw nvae; + } } + else { + NoViableAltException nvae = + new NoViableAltException("", 1, 0, input); - after(grammarAccess.getCategoryAccess().getAlternatives()); - + throw nvae; } + switch (alt1) { + case 1 : + // InternalTqcl.g:482:2: ( ruleGoOut ) + { + // InternalTqcl.g:482:2: ( ruleGoOut ) + // InternalTqcl.g:483:3: ruleGoOut + { + before(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); + pushFollow(FOLLOW_2); + ruleGoOut(); + state._fsp--; - } + after(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { + } - restoreStackSize(stackSize); - } - return ; - } - // $ANTLR end "ruleCategory" + } + break; + case 2 : + // InternalTqcl.g:488:2: ( ruleGoTop ) + { + // InternalTqcl.g:488:2: ( ruleGoTop ) + // InternalTqcl.g:489:3: ruleGoTop + { + before(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); + pushFollow(FOLLOW_2); + ruleGoTop(); + + state._fsp--; + + after(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); + + } + + + } + break; + + } + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__CompositeCommand__EndAlternatives_2_0" - // $ANTLR start "rule__Command__Alternatives_0" - // InternalTqcl.g:427:1: rule__Command__Alternatives_0 : ( ( ruleInsert ) | ( ruleConnect ) | ( ruleSet ) | ( ruleGoInto ) | ( ruleGoOut ) | ( ruleGoTop ) | ( ruleInclude ) ); - public final void rule__Command__Alternatives_0() throws RecognitionException { + // $ANTLR start "rule__SimpleCommand__Alternatives_0" + // InternalTqcl.g:498:1: rule__SimpleCommand__Alternatives_0 : ( ( ruleInsert ) | ( ruleConnect ) | ( ruleSet ) | ( ruleInclude ) ); + public final void rule__SimpleCommand__Alternatives_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:431:1: ( ( ruleInsert ) | ( ruleConnect ) | ( ruleSet ) | ( ruleGoInto ) | ( ruleGoOut ) | ( ruleGoTop ) | ( ruleInclude ) ) - int alt1=7; + // InternalTqcl.g:502:1: ( ( ruleInsert ) | ( ruleConnect ) | ( ruleSet ) | ( ruleInclude ) ) + int alt2=4; switch ( input.LA(1) ) { case 20: { - alt1=1; + alt2=1; } break; case 25: { - alt1=2; + alt2=2; } break; case 24: { - alt1=3; - } - break; - case 27: - { - switch ( input.LA(2) ) { - case 32: - { - alt1=6; - } - break; - case 31: - { - alt1=5; - } - break; - case 30: - { - alt1=4; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 1, 4, input); - - throw nvae; - } - + alt2=3; } break; case 18: { - alt1=7; + alt2=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 1, 0, input); + new NoViableAltException("", 2, 0, input); throw nvae; } - switch (alt1) { + switch (alt2) { case 1 : - // InternalTqcl.g:432:2: ( ruleInsert ) + // InternalTqcl.g:503:2: ( ruleInsert ) { - // InternalTqcl.g:432:2: ( ruleInsert ) - // InternalTqcl.g:433:3: ruleInsert + // InternalTqcl.g:503:2: ( ruleInsert ) + // InternalTqcl.g:504:3: ruleInsert { - before(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); + before(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); pushFollow(FOLLOW_2); ruleInsert(); state._fsp--; - after(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); + after(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); } @@ -1312,18 +1528,18 @@ public final void rule__Command__Alternatives_0() throws RecognitionException { } break; case 2 : - // InternalTqcl.g:438:2: ( ruleConnect ) + // InternalTqcl.g:509:2: ( ruleConnect ) { - // InternalTqcl.g:438:2: ( ruleConnect ) - // InternalTqcl.g:439:3: ruleConnect + // InternalTqcl.g:509:2: ( ruleConnect ) + // InternalTqcl.g:510:3: ruleConnect { - before(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); + before(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); pushFollow(FOLLOW_2); ruleConnect(); state._fsp--; - after(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); + after(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); } @@ -1331,18 +1547,18 @@ public final void rule__Command__Alternatives_0() throws RecognitionException { } break; case 3 : - // InternalTqcl.g:444:2: ( ruleSet ) + // InternalTqcl.g:515:2: ( ruleSet ) { - // InternalTqcl.g:444:2: ( ruleSet ) - // InternalTqcl.g:445:3: ruleSet + // InternalTqcl.g:515:2: ( ruleSet ) + // InternalTqcl.g:516:3: ruleSet { - before(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); + before(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); pushFollow(FOLLOW_2); ruleSet(); state._fsp--; - after(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); + after(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); } @@ -1350,75 +1566,97 @@ public final void rule__Command__Alternatives_0() throws RecognitionException { } break; case 4 : - // InternalTqcl.g:450:2: ( ruleGoInto ) + // InternalTqcl.g:521:2: ( ruleInclude ) { - // InternalTqcl.g:450:2: ( ruleGoInto ) - // InternalTqcl.g:451:3: ruleGoInto + // InternalTqcl.g:521:2: ( ruleInclude ) + // InternalTqcl.g:522:3: ruleInclude { - before(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); + before(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); pushFollow(FOLLOW_2); - ruleGoInto(); + ruleInclude(); state._fsp--; - after(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); + after(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); } } break; - case 5 : - // InternalTqcl.g:456:2: ( ruleGoOut ) - { - // InternalTqcl.g:456:2: ( ruleGoOut ) - // InternalTqcl.g:457:3: ruleGoOut - { - before(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); - pushFollow(FOLLOW_2); - ruleGoOut(); - state._fsp--; + } + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { - after(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); + restoreStackSize(stackSize); - } + } + return ; + } + // $ANTLR end "rule__SimpleCommand__Alternatives_0" - } - break; - case 6 : - // InternalTqcl.g:462:2: ( ruleGoTop ) + // $ANTLR start "rule__Command__Alternatives" + // InternalTqcl.g:531:1: rule__Command__Alternatives : ( ( ruleSimpleCommand ) | ( ruleCompositeCommand ) ); + public final void rule__Command__Alternatives() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:535:1: ( ( ruleSimpleCommand ) | ( ruleCompositeCommand ) ) + int alt3=2; + int LA3_0 = input.LA(1); + + if ( (LA3_0==18||LA3_0==20||(LA3_0>=24 && LA3_0<=25)) ) { + alt3=1; + } + else if ( (LA3_0==28) ) { + alt3=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 3, 0, input); + + throw nvae; + } + switch (alt3) { + case 1 : + // InternalTqcl.g:536:2: ( ruleSimpleCommand ) { - // InternalTqcl.g:462:2: ( ruleGoTop ) - // InternalTqcl.g:463:3: ruleGoTop + // InternalTqcl.g:536:2: ( ruleSimpleCommand ) + // InternalTqcl.g:537:3: ruleSimpleCommand { - before(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); + before(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); pushFollow(FOLLOW_2); - ruleGoTop(); + ruleSimpleCommand(); state._fsp--; - after(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); + after(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); } } break; - case 7 : - // InternalTqcl.g:468:2: ( ruleInclude ) + case 2 : + // InternalTqcl.g:542:2: ( ruleCompositeCommand ) { - // InternalTqcl.g:468:2: ( ruleInclude ) - // InternalTqcl.g:469:3: ruleInclude + // InternalTqcl.g:542:2: ( ruleCompositeCommand ) + // InternalTqcl.g:543:3: ruleCompositeCommand { - before(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); + before(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); pushFollow(FOLLOW_2); - ruleInclude(); + ruleCompositeCommand(); state._fsp--; - after(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); + after(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); } @@ -1439,38 +1677,38 @@ public final void rule__Command__Alternatives_0() throws RecognitionException { } return ; } - // $ANTLR end "rule__Command__Alternatives_0" + // $ANTLR end "rule__Command__Alternatives" // $ANTLR start "rule__Parameter_id__Alternatives" - // InternalTqcl.g:478:1: rule__Parameter_id__Alternatives : ( ( RULE_PARAMETER_NAME ) | ( RULE_STRING ) ); + // InternalTqcl.g:552:1: rule__Parameter_id__Alternatives : ( ( RULE_PARAMETER_NAME ) | ( RULE_STRING ) ); public final void rule__Parameter_id__Alternatives() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:482:1: ( ( RULE_PARAMETER_NAME ) | ( RULE_STRING ) ) - int alt2=2; - int LA2_0 = input.LA(1); + // InternalTqcl.g:556:1: ( ( RULE_PARAMETER_NAME ) | ( RULE_STRING ) ) + int alt4=2; + int LA4_0 = input.LA(1); - if ( (LA2_0==RULE_PARAMETER_NAME) ) { - alt2=1; + if ( (LA4_0==RULE_PARAMETER_NAME) ) { + alt4=1; } - else if ( (LA2_0==RULE_STRING) ) { - alt2=2; + else if ( (LA4_0==RULE_STRING) ) { + alt4=2; } else { NoViableAltException nvae = - new NoViableAltException("", 2, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } - switch (alt2) { + switch (alt4) { case 1 : - // InternalTqcl.g:483:2: ( RULE_PARAMETER_NAME ) + // InternalTqcl.g:557:2: ( RULE_PARAMETER_NAME ) { - // InternalTqcl.g:483:2: ( RULE_PARAMETER_NAME ) - // InternalTqcl.g:484:3: RULE_PARAMETER_NAME + // InternalTqcl.g:557:2: ( RULE_PARAMETER_NAME ) + // InternalTqcl.g:558:3: RULE_PARAMETER_NAME { before(grammarAccess.getParameter_idAccess().getPARAMETER_NAMETerminalRuleCall_0()); match(input,RULE_PARAMETER_NAME,FOLLOW_2); @@ -1482,10 +1720,10 @@ else if ( (LA2_0==RULE_STRING) ) { } break; case 2 : - // InternalTqcl.g:489:2: ( RULE_STRING ) + // InternalTqcl.g:563:2: ( RULE_STRING ) { - // InternalTqcl.g:489:2: ( RULE_STRING ) - // InternalTqcl.g:490:3: RULE_STRING + // InternalTqcl.g:563:2: ( RULE_STRING ) + // InternalTqcl.g:564:3: RULE_STRING { before(grammarAccess.getParameter_idAccess().getSTRINGTerminalRuleCall_1()); match(input,RULE_STRING,FOLLOW_2); @@ -1514,34 +1752,34 @@ else if ( (LA2_0==RULE_STRING) ) { // $ANTLR start "rule__NamedObj__Alternatives" - // InternalTqcl.g:499:1: rule__NamedObj__Alternatives : ( ( RULE_ID ) | ( RULE_STRING ) ); + // InternalTqcl.g:573:1: rule__NamedObj__Alternatives : ( ( RULE_ID ) | ( RULE_STRING ) ); public final void rule__NamedObj__Alternatives() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:503:1: ( ( RULE_ID ) | ( RULE_STRING ) ) - int alt3=2; - int LA3_0 = input.LA(1); + // InternalTqcl.g:577:1: ( ( RULE_ID ) | ( RULE_STRING ) ) + int alt5=2; + int LA5_0 = input.LA(1); - if ( (LA3_0==RULE_ID) ) { - alt3=1; + if ( (LA5_0==RULE_ID) ) { + alt5=1; } - else if ( (LA3_0==RULE_STRING) ) { - alt3=2; + else if ( (LA5_0==RULE_STRING) ) { + alt5=2; } else { NoViableAltException nvae = - new NoViableAltException("", 3, 0, input); + new NoViableAltException("", 5, 0, input); throw nvae; } - switch (alt3) { + switch (alt5) { case 1 : - // InternalTqcl.g:504:2: ( RULE_ID ) + // InternalTqcl.g:578:2: ( RULE_ID ) { - // InternalTqcl.g:504:2: ( RULE_ID ) - // InternalTqcl.g:505:3: RULE_ID + // InternalTqcl.g:578:2: ( RULE_ID ) + // InternalTqcl.g:579:3: RULE_ID { before(grammarAccess.getNamedObjAccess().getIDTerminalRuleCall_0()); match(input,RULE_ID,FOLLOW_2); @@ -1553,10 +1791,10 @@ else if ( (LA3_0==RULE_STRING) ) { } break; case 2 : - // InternalTqcl.g:510:2: ( RULE_STRING ) + // InternalTqcl.g:584:2: ( RULE_STRING ) { - // InternalTqcl.g:510:2: ( RULE_STRING ) - // InternalTqcl.g:511:3: RULE_STRING + // InternalTqcl.g:584:2: ( RULE_STRING ) + // InternalTqcl.g:585:3: RULE_STRING { before(grammarAccess.getNamedObjAccess().getSTRINGTerminalRuleCall_1()); match(input,RULE_STRING,FOLLOW_2); @@ -1585,52 +1823,52 @@ else if ( (LA3_0==RULE_STRING) ) { // $ANTLR start "rule__Category__Alternatives" - // InternalTqcl.g:520:1: rule__Category__Alternatives : ( ( ( 'actor' ) ) | ( ( 'parameter' ) ) | ( ( 'port' ) ) | ( ( 'director' ) ) ); + // InternalTqcl.g:594:1: rule__Category__Alternatives : ( ( ( 'actor' ) ) | ( ( 'parameter' ) ) | ( ( 'port' ) ) | ( ( 'director' ) ) ); public final void rule__Category__Alternatives() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:524:1: ( ( ( 'actor' ) ) | ( ( 'parameter' ) ) | ( ( 'port' ) ) | ( ( 'director' ) ) ) - int alt4=4; + // InternalTqcl.g:598:1: ( ( ( 'actor' ) ) | ( ( 'parameter' ) ) | ( ( 'port' ) ) | ( ( 'director' ) ) ) + int alt6=4; switch ( input.LA(1) ) { case 13: { - alt4=1; + alt6=1; } break; case 14: { - alt4=2; + alt6=2; } break; case 15: { - alt4=3; + alt6=3; } break; case 16: { - alt4=4; + alt6=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 4, 0, input); + new NoViableAltException("", 6, 0, input); throw nvae; } - switch (alt4) { + switch (alt6) { case 1 : - // InternalTqcl.g:525:2: ( ( 'actor' ) ) + // InternalTqcl.g:599:2: ( ( 'actor' ) ) { - // InternalTqcl.g:525:2: ( ( 'actor' ) ) - // InternalTqcl.g:526:3: ( 'actor' ) + // InternalTqcl.g:599:2: ( ( 'actor' ) ) + // InternalTqcl.g:600:3: ( 'actor' ) { before(grammarAccess.getCategoryAccess().getActorEnumLiteralDeclaration_0()); - // InternalTqcl.g:527:3: ( 'actor' ) - // InternalTqcl.g:527:4: 'actor' + // InternalTqcl.g:601:3: ( 'actor' ) + // InternalTqcl.g:601:4: 'actor' { match(input,13,FOLLOW_2); @@ -1644,14 +1882,14 @@ public final void rule__Category__Alternatives() throws RecognitionException { } break; case 2 : - // InternalTqcl.g:531:2: ( ( 'parameter' ) ) + // InternalTqcl.g:605:2: ( ( 'parameter' ) ) { - // InternalTqcl.g:531:2: ( ( 'parameter' ) ) - // InternalTqcl.g:532:3: ( 'parameter' ) + // InternalTqcl.g:605:2: ( ( 'parameter' ) ) + // InternalTqcl.g:606:3: ( 'parameter' ) { before(grammarAccess.getCategoryAccess().getParameterEnumLiteralDeclaration_1()); - // InternalTqcl.g:533:3: ( 'parameter' ) - // InternalTqcl.g:533:4: 'parameter' + // InternalTqcl.g:607:3: ( 'parameter' ) + // InternalTqcl.g:607:4: 'parameter' { match(input,14,FOLLOW_2); @@ -1665,14 +1903,14 @@ public final void rule__Category__Alternatives() throws RecognitionException { } break; case 3 : - // InternalTqcl.g:537:2: ( ( 'port' ) ) + // InternalTqcl.g:611:2: ( ( 'port' ) ) { - // InternalTqcl.g:537:2: ( ( 'port' ) ) - // InternalTqcl.g:538:3: ( 'port' ) + // InternalTqcl.g:611:2: ( ( 'port' ) ) + // InternalTqcl.g:612:3: ( 'port' ) { before(grammarAccess.getCategoryAccess().getPortEnumLiteralDeclaration_2()); - // InternalTqcl.g:539:3: ( 'port' ) - // InternalTqcl.g:539:4: 'port' + // InternalTqcl.g:613:3: ( 'port' ) + // InternalTqcl.g:613:4: 'port' { match(input,15,FOLLOW_2); @@ -1686,14 +1924,14 @@ public final void rule__Category__Alternatives() throws RecognitionException { } break; case 4 : - // InternalTqcl.g:543:2: ( ( 'director' ) ) + // InternalTqcl.g:617:2: ( ( 'director' ) ) { - // InternalTqcl.g:543:2: ( ( 'director' ) ) - // InternalTqcl.g:544:3: ( 'director' ) + // InternalTqcl.g:617:2: ( ( 'director' ) ) + // InternalTqcl.g:618:3: ( 'director' ) { before(grammarAccess.getCategoryAccess().getDirectorEnumLiteralDeclaration_3()); - // InternalTqcl.g:545:3: ( 'director' ) - // InternalTqcl.g:545:4: 'director' + // InternalTqcl.g:619:3: ( 'director' ) + // InternalTqcl.g:619:4: 'director' { match(input,16,FOLLOW_2); @@ -1724,14 +1962,14 @@ public final void rule__Category__Alternatives() throws RecognitionException { // $ANTLR start "rule__TriquetrumScript__Group__0" - // InternalTqcl.g:553:1: rule__TriquetrumScript__Group__0 : rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 ; + // InternalTqcl.g:627:1: rule__TriquetrumScript__Group__0 : rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 ; public final void rule__TriquetrumScript__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:557:1: ( rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 ) - // InternalTqcl.g:558:2: rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 + // InternalTqcl.g:631:1: ( rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 ) + // InternalTqcl.g:632:2: rule__TriquetrumScript__Group__0__Impl rule__TriquetrumScript__Group__1 { pushFollow(FOLLOW_3); rule__TriquetrumScript__Group__0__Impl(); @@ -1762,33 +2000,33 @@ public final void rule__TriquetrumScript__Group__0() throws RecognitionException // $ANTLR start "rule__TriquetrumScript__Group__0__Impl" - // InternalTqcl.g:565:1: rule__TriquetrumScript__Group__0__Impl : ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) ; + // InternalTqcl.g:639:1: rule__TriquetrumScript__Group__0__Impl : ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) ; public final void rule__TriquetrumScript__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:569:1: ( ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) ) - // InternalTqcl.g:570:1: ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) + // InternalTqcl.g:643:1: ( ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) ) + // InternalTqcl.g:644:1: ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) { - // InternalTqcl.g:570:1: ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) - // InternalTqcl.g:571:2: ( rule__TriquetrumScript__LibrariesAssignment_0 )* + // InternalTqcl.g:644:1: ( ( rule__TriquetrumScript__LibrariesAssignment_0 )* ) + // InternalTqcl.g:645:2: ( rule__TriquetrumScript__LibrariesAssignment_0 )* { before(grammarAccess.getTriquetrumScriptAccess().getLibrariesAssignment_0()); - // InternalTqcl.g:572:2: ( rule__TriquetrumScript__LibrariesAssignment_0 )* - loop5: + // InternalTqcl.g:646:2: ( rule__TriquetrumScript__LibrariesAssignment_0 )* + loop7: do { - int alt5=2; - int LA5_0 = input.LA(1); + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA5_0==19) ) { - alt5=1; + if ( (LA7_0==19) ) { + alt7=1; } - switch (alt5) { + switch (alt7) { case 1 : - // InternalTqcl.g:572:3: rule__TriquetrumScript__LibrariesAssignment_0 + // InternalTqcl.g:646:3: rule__TriquetrumScript__LibrariesAssignment_0 { pushFollow(FOLLOW_4); rule__TriquetrumScript__LibrariesAssignment_0(); @@ -1800,7 +2038,7 @@ public final void rule__TriquetrumScript__Group__0__Impl() throws RecognitionExc break; default : - break loop5; + break loop7; } } while (true); @@ -1827,14 +2065,14 @@ public final void rule__TriquetrumScript__Group__0__Impl() throws RecognitionExc // $ANTLR start "rule__TriquetrumScript__Group__1" - // InternalTqcl.g:580:1: rule__TriquetrumScript__Group__1 : rule__TriquetrumScript__Group__1__Impl ; + // InternalTqcl.g:654:1: rule__TriquetrumScript__Group__1 : rule__TriquetrumScript__Group__1__Impl ; public final void rule__TriquetrumScript__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:584:1: ( rule__TriquetrumScript__Group__1__Impl ) - // InternalTqcl.g:585:2: rule__TriquetrumScript__Group__1__Impl + // InternalTqcl.g:658:1: ( rule__TriquetrumScript__Group__1__Impl ) + // InternalTqcl.g:659:2: rule__TriquetrumScript__Group__1__Impl { pushFollow(FOLLOW_2); rule__TriquetrumScript__Group__1__Impl(); @@ -1860,33 +2098,33 @@ public final void rule__TriquetrumScript__Group__1() throws RecognitionException // $ANTLR start "rule__TriquetrumScript__Group__1__Impl" - // InternalTqcl.g:591:1: rule__TriquetrumScript__Group__1__Impl : ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) ; + // InternalTqcl.g:665:1: rule__TriquetrumScript__Group__1__Impl : ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) ; public final void rule__TriquetrumScript__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:595:1: ( ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) ) - // InternalTqcl.g:596:1: ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) + // InternalTqcl.g:669:1: ( ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) ) + // InternalTqcl.g:670:1: ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) { - // InternalTqcl.g:596:1: ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) - // InternalTqcl.g:597:2: ( rule__TriquetrumScript__CommandsAssignment_1 )* + // InternalTqcl.g:670:1: ( ( rule__TriquetrumScript__CommandsAssignment_1 )* ) + // InternalTqcl.g:671:2: ( rule__TriquetrumScript__CommandsAssignment_1 )* { before(grammarAccess.getTriquetrumScriptAccess().getCommandsAssignment_1()); - // InternalTqcl.g:598:2: ( rule__TriquetrumScript__CommandsAssignment_1 )* - loop6: + // InternalTqcl.g:672:2: ( rule__TriquetrumScript__CommandsAssignment_1 )* + loop8: do { - int alt6=2; - int LA6_0 = input.LA(1); + int alt8=2; + int LA8_0 = input.LA(1); - if ( (LA6_0==18||LA6_0==20||(LA6_0>=24 && LA6_0<=25)||LA6_0==27) ) { - alt6=1; + if ( (LA8_0==18||LA8_0==20||(LA8_0>=24 && LA8_0<=25)||LA8_0==28) ) { + alt8=1; } - switch (alt6) { + switch (alt8) { case 1 : - // InternalTqcl.g:598:3: rule__TriquetrumScript__CommandsAssignment_1 + // InternalTqcl.g:672:3: rule__TriquetrumScript__CommandsAssignment_1 { pushFollow(FOLLOW_5); rule__TriquetrumScript__CommandsAssignment_1(); @@ -1898,7 +2136,7 @@ public final void rule__TriquetrumScript__Group__1__Impl() throws RecognitionExc break; default : - break loop6; + break loop8; } } while (true); @@ -1924,23 +2162,23 @@ public final void rule__TriquetrumScript__Group__1__Impl() throws RecognitionExc // $ANTLR end "rule__TriquetrumScript__Group__1__Impl" - // $ANTLR start "rule__Command__Group__0" - // InternalTqcl.g:607:1: rule__Command__Group__0 : rule__Command__Group__0__Impl rule__Command__Group__1 ; - public final void rule__Command__Group__0() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__0" + // InternalTqcl.g:681:1: rule__CompositeCommand__Group__0 : rule__CompositeCommand__Group__0__Impl rule__CompositeCommand__Group__1 ; + public final void rule__CompositeCommand__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:611:1: ( rule__Command__Group__0__Impl rule__Command__Group__1 ) - // InternalTqcl.g:612:2: rule__Command__Group__0__Impl rule__Command__Group__1 + // InternalTqcl.g:685:1: ( rule__CompositeCommand__Group__0__Impl rule__CompositeCommand__Group__1 ) + // InternalTqcl.g:686:2: rule__CompositeCommand__Group__0__Impl rule__CompositeCommand__Group__1 { - pushFollow(FOLLOW_6); - rule__Command__Group__0__Impl(); + pushFollow(FOLLOW_3); + rule__CompositeCommand__Group__0__Impl(); state._fsp--; pushFollow(FOLLOW_2); - rule__Command__Group__1(); + rule__CompositeCommand__Group__1(); state._fsp--; @@ -1959,35 +2197,35 @@ public final void rule__Command__Group__0() throws RecognitionException { } return ; } - // $ANTLR end "rule__Command__Group__0" + // $ANTLR end "rule__CompositeCommand__Group__0" - // $ANTLR start "rule__Command__Group__0__Impl" - // InternalTqcl.g:619:1: rule__Command__Group__0__Impl : ( ( rule__Command__Alternatives_0 ) ) ; - public final void rule__Command__Group__0__Impl() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__0__Impl" + // InternalTqcl.g:693:1: rule__CompositeCommand__Group__0__Impl : ( ( rule__CompositeCommand__StartAssignment_0 ) ) ; + public final void rule__CompositeCommand__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:623:1: ( ( ( rule__Command__Alternatives_0 ) ) ) - // InternalTqcl.g:624:1: ( ( rule__Command__Alternatives_0 ) ) + // InternalTqcl.g:697:1: ( ( ( rule__CompositeCommand__StartAssignment_0 ) ) ) + // InternalTqcl.g:698:1: ( ( rule__CompositeCommand__StartAssignment_0 ) ) { - // InternalTqcl.g:624:1: ( ( rule__Command__Alternatives_0 ) ) - // InternalTqcl.g:625:2: ( rule__Command__Alternatives_0 ) + // InternalTqcl.g:698:1: ( ( rule__CompositeCommand__StartAssignment_0 ) ) + // InternalTqcl.g:699:2: ( rule__CompositeCommand__StartAssignment_0 ) { - before(grammarAccess.getCommandAccess().getAlternatives_0()); - // InternalTqcl.g:626:2: ( rule__Command__Alternatives_0 ) - // InternalTqcl.g:626:3: rule__Command__Alternatives_0 + before(grammarAccess.getCompositeCommandAccess().getStartAssignment_0()); + // InternalTqcl.g:700:2: ( rule__CompositeCommand__StartAssignment_0 ) + // InternalTqcl.g:700:3: rule__CompositeCommand__StartAssignment_0 { pushFollow(FOLLOW_2); - rule__Command__Alternatives_0(); + rule__CompositeCommand__StartAssignment_0(); state._fsp--; } - after(grammarAccess.getCommandAccess().getAlternatives_0()); + after(grammarAccess.getCompositeCommandAccess().getStartAssignment_0()); } @@ -2006,21 +2244,26 @@ public final void rule__Command__Group__0__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Command__Group__0__Impl" + // $ANTLR end "rule__CompositeCommand__Group__0__Impl" - // $ANTLR start "rule__Command__Group__1" - // InternalTqcl.g:634:1: rule__Command__Group__1 : rule__Command__Group__1__Impl ; - public final void rule__Command__Group__1() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__1" + // InternalTqcl.g:708:1: rule__CompositeCommand__Group__1 : rule__CompositeCommand__Group__1__Impl rule__CompositeCommand__Group__2 ; + public final void rule__CompositeCommand__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:638:1: ( rule__Command__Group__1__Impl ) - // InternalTqcl.g:639:2: rule__Command__Group__1__Impl + // InternalTqcl.g:712:1: ( rule__CompositeCommand__Group__1__Impl rule__CompositeCommand__Group__2 ) + // InternalTqcl.g:713:2: rule__CompositeCommand__Group__1__Impl rule__CompositeCommand__Group__2 { + pushFollow(FOLLOW_6); + rule__CompositeCommand__Group__1__Impl(); + + state._fsp--; + pushFollow(FOLLOW_2); - rule__Command__Group__1__Impl(); + rule__CompositeCommand__Group__2(); state._fsp--; @@ -2039,25 +2282,35 @@ public final void rule__Command__Group__1() throws RecognitionException { } return ; } - // $ANTLR end "rule__Command__Group__1" + // $ANTLR end "rule__CompositeCommand__Group__1" - // $ANTLR start "rule__Command__Group__1__Impl" - // InternalTqcl.g:645:1: rule__Command__Group__1__Impl : ( ';' ) ; - public final void rule__Command__Group__1__Impl() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__1__Impl" + // InternalTqcl.g:720:1: rule__CompositeCommand__Group__1__Impl : ( ( rule__CompositeCommand__CommandsAssignment_1 ) ) ; + public final void rule__CompositeCommand__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:649:1: ( ( ';' ) ) - // InternalTqcl.g:650:1: ( ';' ) + // InternalTqcl.g:724:1: ( ( ( rule__CompositeCommand__CommandsAssignment_1 ) ) ) + // InternalTqcl.g:725:1: ( ( rule__CompositeCommand__CommandsAssignment_1 ) ) { - // InternalTqcl.g:650:1: ( ';' ) - // InternalTqcl.g:651:2: ';' + // InternalTqcl.g:725:1: ( ( rule__CompositeCommand__CommandsAssignment_1 ) ) + // InternalTqcl.g:726:2: ( rule__CompositeCommand__CommandsAssignment_1 ) { - before(grammarAccess.getCommandAccess().getSemicolonKeyword_1()); - match(input,17,FOLLOW_2); - after(grammarAccess.getCommandAccess().getSemicolonKeyword_1()); + before(grammarAccess.getCompositeCommandAccess().getCommandsAssignment_1()); + // InternalTqcl.g:727:2: ( rule__CompositeCommand__CommandsAssignment_1 ) + // InternalTqcl.g:727:3: rule__CompositeCommand__CommandsAssignment_1 + { + pushFollow(FOLLOW_2); + rule__CompositeCommand__CommandsAssignment_1(); + + state._fsp--; + + + } + + after(grammarAccess.getCompositeCommandAccess().getCommandsAssignment_1()); } @@ -2076,26 +2329,21 @@ public final void rule__Command__Group__1__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Command__Group__1__Impl" + // $ANTLR end "rule__CompositeCommand__Group__1__Impl" - // $ANTLR start "rule__Include__Group__0" - // InternalTqcl.g:661:1: rule__Include__Group__0 : rule__Include__Group__0__Impl rule__Include__Group__1 ; - public final void rule__Include__Group__0() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__2" + // InternalTqcl.g:735:1: rule__CompositeCommand__Group__2 : rule__CompositeCommand__Group__2__Impl ; + public final void rule__CompositeCommand__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:665:1: ( rule__Include__Group__0__Impl rule__Include__Group__1 ) - // InternalTqcl.g:666:2: rule__Include__Group__0__Impl rule__Include__Group__1 + // InternalTqcl.g:739:1: ( rule__CompositeCommand__Group__2__Impl ) + // InternalTqcl.g:740:2: rule__CompositeCommand__Group__2__Impl { - pushFollow(FOLLOW_7); - rule__Include__Group__0__Impl(); - - state._fsp--; - pushFollow(FOLLOW_2); - rule__Include__Group__1(); + rule__CompositeCommand__Group__2__Impl(); state._fsp--; @@ -2114,25 +2362,35 @@ public final void rule__Include__Group__0() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__0" + // $ANTLR end "rule__CompositeCommand__Group__2" - // $ANTLR start "rule__Include__Group__0__Impl" - // InternalTqcl.g:673:1: rule__Include__Group__0__Impl : ( 'include' ) ; - public final void rule__Include__Group__0__Impl() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__Group__2__Impl" + // InternalTqcl.g:746:1: rule__CompositeCommand__Group__2__Impl : ( ( rule__CompositeCommand__EndAssignment_2 ) ) ; + public final void rule__CompositeCommand__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:677:1: ( ( 'include' ) ) - // InternalTqcl.g:678:1: ( 'include' ) + // InternalTqcl.g:750:1: ( ( ( rule__CompositeCommand__EndAssignment_2 ) ) ) + // InternalTqcl.g:751:1: ( ( rule__CompositeCommand__EndAssignment_2 ) ) { - // InternalTqcl.g:678:1: ( 'include' ) - // InternalTqcl.g:679:2: 'include' + // InternalTqcl.g:751:1: ( ( rule__CompositeCommand__EndAssignment_2 ) ) + // InternalTqcl.g:752:2: ( rule__CompositeCommand__EndAssignment_2 ) { - before(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); - match(input,18,FOLLOW_2); - after(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); + before(grammarAccess.getCompositeCommandAccess().getEndAssignment_2()); + // InternalTqcl.g:753:2: ( rule__CompositeCommand__EndAssignment_2 ) + // InternalTqcl.g:753:3: rule__CompositeCommand__EndAssignment_2 + { + pushFollow(FOLLOW_2); + rule__CompositeCommand__EndAssignment_2(); + + state._fsp--; + + + } + + after(grammarAccess.getCompositeCommandAccess().getEndAssignment_2()); } @@ -2151,26 +2409,26 @@ public final void rule__Include__Group__0__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__0__Impl" + // $ANTLR end "rule__CompositeCommand__Group__2__Impl" - // $ANTLR start "rule__Include__Group__1" - // InternalTqcl.g:688:1: rule__Include__Group__1 : rule__Include__Group__1__Impl rule__Include__Group__2 ; - public final void rule__Include__Group__1() throws RecognitionException { + // $ANTLR start "rule__SimpleCommand__Group__0" + // InternalTqcl.g:762:1: rule__SimpleCommand__Group__0 : rule__SimpleCommand__Group__0__Impl rule__SimpleCommand__Group__1 ; + public final void rule__SimpleCommand__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:692:1: ( rule__Include__Group__1__Impl rule__Include__Group__2 ) - // InternalTqcl.g:693:2: rule__Include__Group__1__Impl rule__Include__Group__2 + // InternalTqcl.g:766:1: ( rule__SimpleCommand__Group__0__Impl rule__SimpleCommand__Group__1 ) + // InternalTqcl.g:767:2: rule__SimpleCommand__Group__0__Impl rule__SimpleCommand__Group__1 { - pushFollow(FOLLOW_6); - rule__Include__Group__1__Impl(); + pushFollow(FOLLOW_7); + rule__SimpleCommand__Group__0__Impl(); state._fsp--; pushFollow(FOLLOW_2); - rule__Include__Group__2(); + rule__SimpleCommand__Group__1(); state._fsp--; @@ -2189,35 +2447,35 @@ public final void rule__Include__Group__1() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__1" + // $ANTLR end "rule__SimpleCommand__Group__0" - // $ANTLR start "rule__Include__Group__1__Impl" - // InternalTqcl.g:700:1: rule__Include__Group__1__Impl : ( ( rule__Include__FilenameAssignment_1 ) ) ; - public final void rule__Include__Group__1__Impl() throws RecognitionException { + // $ANTLR start "rule__SimpleCommand__Group__0__Impl" + // InternalTqcl.g:774:1: rule__SimpleCommand__Group__0__Impl : ( ( rule__SimpleCommand__Alternatives_0 ) ) ; + public final void rule__SimpleCommand__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:704:1: ( ( ( rule__Include__FilenameAssignment_1 ) ) ) - // InternalTqcl.g:705:1: ( ( rule__Include__FilenameAssignment_1 ) ) + // InternalTqcl.g:778:1: ( ( ( rule__SimpleCommand__Alternatives_0 ) ) ) + // InternalTqcl.g:779:1: ( ( rule__SimpleCommand__Alternatives_0 ) ) { - // InternalTqcl.g:705:1: ( ( rule__Include__FilenameAssignment_1 ) ) - // InternalTqcl.g:706:2: ( rule__Include__FilenameAssignment_1 ) + // InternalTqcl.g:779:1: ( ( rule__SimpleCommand__Alternatives_0 ) ) + // InternalTqcl.g:780:2: ( rule__SimpleCommand__Alternatives_0 ) { - before(grammarAccess.getIncludeAccess().getFilenameAssignment_1()); - // InternalTqcl.g:707:2: ( rule__Include__FilenameAssignment_1 ) - // InternalTqcl.g:707:3: rule__Include__FilenameAssignment_1 + before(grammarAccess.getSimpleCommandAccess().getAlternatives_0()); + // InternalTqcl.g:781:2: ( rule__SimpleCommand__Alternatives_0 ) + // InternalTqcl.g:781:3: rule__SimpleCommand__Alternatives_0 { pushFollow(FOLLOW_2); - rule__Include__FilenameAssignment_1(); + rule__SimpleCommand__Alternatives_0(); state._fsp--; } - after(grammarAccess.getIncludeAccess().getFilenameAssignment_1()); + after(grammarAccess.getSimpleCommandAccess().getAlternatives_0()); } @@ -2236,21 +2494,21 @@ public final void rule__Include__Group__1__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__1__Impl" + // $ANTLR end "rule__SimpleCommand__Group__0__Impl" - // $ANTLR start "rule__Include__Group__2" - // InternalTqcl.g:715:1: rule__Include__Group__2 : rule__Include__Group__2__Impl ; - public final void rule__Include__Group__2() throws RecognitionException { + // $ANTLR start "rule__SimpleCommand__Group__1" + // InternalTqcl.g:789:1: rule__SimpleCommand__Group__1 : rule__SimpleCommand__Group__1__Impl ; + public final void rule__SimpleCommand__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:719:1: ( rule__Include__Group__2__Impl ) - // InternalTqcl.g:720:2: rule__Include__Group__2__Impl + // InternalTqcl.g:793:1: ( rule__SimpleCommand__Group__1__Impl ) + // InternalTqcl.g:794:2: rule__SimpleCommand__Group__1__Impl { pushFollow(FOLLOW_2); - rule__Include__Group__2__Impl(); + rule__SimpleCommand__Group__1__Impl(); state._fsp--; @@ -2269,25 +2527,25 @@ public final void rule__Include__Group__2() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__2" + // $ANTLR end "rule__SimpleCommand__Group__1" - // $ANTLR start "rule__Include__Group__2__Impl" - // InternalTqcl.g:726:1: rule__Include__Group__2__Impl : ( ';' ) ; - public final void rule__Include__Group__2__Impl() throws RecognitionException { + // $ANTLR start "rule__SimpleCommand__Group__1__Impl" + // InternalTqcl.g:800:1: rule__SimpleCommand__Group__1__Impl : ( ';' ) ; + public final void rule__SimpleCommand__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:730:1: ( ( ';' ) ) - // InternalTqcl.g:731:1: ( ';' ) + // InternalTqcl.g:804:1: ( ( ';' ) ) + // InternalTqcl.g:805:1: ( ';' ) { - // InternalTqcl.g:731:1: ( ';' ) - // InternalTqcl.g:732:2: ';' + // InternalTqcl.g:805:1: ( ';' ) + // InternalTqcl.g:806:2: ';' { - before(grammarAccess.getIncludeAccess().getSemicolonKeyword_2()); + before(grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); match(input,17,FOLLOW_2); - after(grammarAccess.getIncludeAccess().getSemicolonKeyword_2()); + after(grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); } @@ -2306,26 +2564,26 @@ public final void rule__Include__Group__2__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Include__Group__2__Impl" + // $ANTLR end "rule__SimpleCommand__Group__1__Impl" - // $ANTLR start "rule__Library__Group__0" - // InternalTqcl.g:742:1: rule__Library__Group__0 : rule__Library__Group__0__Impl rule__Library__Group__1 ; - public final void rule__Library__Group__0() throws RecognitionException { + // $ANTLR start "rule__Include__Group__0" + // InternalTqcl.g:816:1: rule__Include__Group__0 : rule__Include__Group__0__Impl rule__Include__Group__1 ; + public final void rule__Include__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:746:1: ( rule__Library__Group__0__Impl rule__Library__Group__1 ) - // InternalTqcl.g:747:2: rule__Library__Group__0__Impl rule__Library__Group__1 + // InternalTqcl.g:820:1: ( rule__Include__Group__0__Impl rule__Include__Group__1 ) + // InternalTqcl.g:821:2: rule__Include__Group__0__Impl rule__Include__Group__1 { pushFollow(FOLLOW_8); - rule__Library__Group__0__Impl(); + rule__Include__Group__0__Impl(); state._fsp--; pushFollow(FOLLOW_2); - rule__Library__Group__1(); + rule__Include__Group__1(); state._fsp--; @@ -2344,25 +2602,25 @@ public final void rule__Library__Group__0() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__0" + // $ANTLR end "rule__Include__Group__0" - // $ANTLR start "rule__Library__Group__0__Impl" - // InternalTqcl.g:754:1: rule__Library__Group__0__Impl : ( 'library' ) ; - public final void rule__Library__Group__0__Impl() throws RecognitionException { + // $ANTLR start "rule__Include__Group__0__Impl" + // InternalTqcl.g:828:1: rule__Include__Group__0__Impl : ( 'include' ) ; + public final void rule__Include__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:758:1: ( ( 'library' ) ) - // InternalTqcl.g:759:1: ( 'library' ) + // InternalTqcl.g:832:1: ( ( 'include' ) ) + // InternalTqcl.g:833:1: ( 'include' ) { - // InternalTqcl.g:759:1: ( 'library' ) - // InternalTqcl.g:760:2: 'library' + // InternalTqcl.g:833:1: ( 'include' ) + // InternalTqcl.g:834:2: 'include' { - before(grammarAccess.getLibraryAccess().getLibraryKeyword_0()); - match(input,19,FOLLOW_2); - after(grammarAccess.getLibraryAccess().getLibraryKeyword_0()); + before(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); + match(input,18,FOLLOW_2); + after(grammarAccess.getIncludeAccess().getIncludeKeyword_0()); } @@ -2381,26 +2639,26 @@ public final void rule__Library__Group__0__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__0__Impl" + // $ANTLR end "rule__Include__Group__0__Impl" - // $ANTLR start "rule__Library__Group__1" - // InternalTqcl.g:769:1: rule__Library__Group__1 : rule__Library__Group__1__Impl rule__Library__Group__2 ; - public final void rule__Library__Group__1() throws RecognitionException { + // $ANTLR start "rule__Include__Group__1" + // InternalTqcl.g:843:1: rule__Include__Group__1 : rule__Include__Group__1__Impl rule__Include__Group__2 ; + public final void rule__Include__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:773:1: ( rule__Library__Group__1__Impl rule__Library__Group__2 ) - // InternalTqcl.g:774:2: rule__Library__Group__1__Impl rule__Library__Group__2 + // InternalTqcl.g:847:1: ( rule__Include__Group__1__Impl rule__Include__Group__2 ) + // InternalTqcl.g:848:2: rule__Include__Group__1__Impl rule__Include__Group__2 { - pushFollow(FOLLOW_6); - rule__Library__Group__1__Impl(); + pushFollow(FOLLOW_7); + rule__Include__Group__1__Impl(); state._fsp--; pushFollow(FOLLOW_2); - rule__Library__Group__2(); + rule__Include__Group__2(); state._fsp--; @@ -2419,35 +2677,35 @@ public final void rule__Library__Group__1() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__1" + // $ANTLR end "rule__Include__Group__1" - // $ANTLR start "rule__Library__Group__1__Impl" - // InternalTqcl.g:781:1: rule__Library__Group__1__Impl : ( ( rule__Library__NameAssignment_1 ) ) ; - public final void rule__Library__Group__1__Impl() throws RecognitionException { + // $ANTLR start "rule__Include__Group__1__Impl" + // InternalTqcl.g:855:1: rule__Include__Group__1__Impl : ( ( rule__Include__FilenameAssignment_1 ) ) ; + public final void rule__Include__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:785:1: ( ( ( rule__Library__NameAssignment_1 ) ) ) - // InternalTqcl.g:786:1: ( ( rule__Library__NameAssignment_1 ) ) + // InternalTqcl.g:859:1: ( ( ( rule__Include__FilenameAssignment_1 ) ) ) + // InternalTqcl.g:860:1: ( ( rule__Include__FilenameAssignment_1 ) ) { - // InternalTqcl.g:786:1: ( ( rule__Library__NameAssignment_1 ) ) - // InternalTqcl.g:787:2: ( rule__Library__NameAssignment_1 ) + // InternalTqcl.g:860:1: ( ( rule__Include__FilenameAssignment_1 ) ) + // InternalTqcl.g:861:2: ( rule__Include__FilenameAssignment_1 ) { - before(grammarAccess.getLibraryAccess().getNameAssignment_1()); - // InternalTqcl.g:788:2: ( rule__Library__NameAssignment_1 ) - // InternalTqcl.g:788:3: rule__Library__NameAssignment_1 + before(grammarAccess.getIncludeAccess().getFilenameAssignment_1()); + // InternalTqcl.g:862:2: ( rule__Include__FilenameAssignment_1 ) + // InternalTqcl.g:862:3: rule__Include__FilenameAssignment_1 { pushFollow(FOLLOW_2); - rule__Library__NameAssignment_1(); + rule__Include__FilenameAssignment_1(); state._fsp--; } - after(grammarAccess.getLibraryAccess().getNameAssignment_1()); + after(grammarAccess.getIncludeAccess().getFilenameAssignment_1()); } @@ -2466,21 +2724,21 @@ public final void rule__Library__Group__1__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__1__Impl" + // $ANTLR end "rule__Include__Group__1__Impl" - // $ANTLR start "rule__Library__Group__2" - // InternalTqcl.g:796:1: rule__Library__Group__2 : rule__Library__Group__2__Impl ; - public final void rule__Library__Group__2() throws RecognitionException { + // $ANTLR start "rule__Include__Group__2" + // InternalTqcl.g:870:1: rule__Include__Group__2 : rule__Include__Group__2__Impl ; + public final void rule__Include__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:800:1: ( rule__Library__Group__2__Impl ) - // InternalTqcl.g:801:2: rule__Library__Group__2__Impl + // InternalTqcl.g:874:1: ( rule__Include__Group__2__Impl ) + // InternalTqcl.g:875:2: rule__Include__Group__2__Impl { pushFollow(FOLLOW_2); - rule__Library__Group__2__Impl(); + rule__Include__Group__2__Impl(); state._fsp--; @@ -2499,25 +2757,25 @@ public final void rule__Library__Group__2() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__2" + // $ANTLR end "rule__Include__Group__2" - // $ANTLR start "rule__Library__Group__2__Impl" - // InternalTqcl.g:807:1: rule__Library__Group__2__Impl : ( ';' ) ; - public final void rule__Library__Group__2__Impl() throws RecognitionException { + // $ANTLR start "rule__Include__Group__2__Impl" + // InternalTqcl.g:881:1: rule__Include__Group__2__Impl : ( ';' ) ; + public final void rule__Include__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:811:1: ( ( ';' ) ) - // InternalTqcl.g:812:1: ( ';' ) + // InternalTqcl.g:885:1: ( ( ';' ) ) + // InternalTqcl.g:886:1: ( ';' ) { - // InternalTqcl.g:812:1: ( ';' ) - // InternalTqcl.g:813:2: ';' + // InternalTqcl.g:886:1: ( ';' ) + // InternalTqcl.g:887:2: ';' { - before(grammarAccess.getLibraryAccess().getSemicolonKeyword_2()); + before(grammarAccess.getIncludeAccess().getSemicolonKeyword_2()); match(input,17,FOLLOW_2); - after(grammarAccess.getLibraryAccess().getSemicolonKeyword_2()); + after(grammarAccess.getIncludeAccess().getSemicolonKeyword_2()); } @@ -2536,26 +2794,26 @@ public final void rule__Library__Group__2__Impl() throws RecognitionException { } return ; } - // $ANTLR end "rule__Library__Group__2__Impl" + // $ANTLR end "rule__Include__Group__2__Impl" - // $ANTLR start "rule__Insert__Group__0" - // InternalTqcl.g:823:1: rule__Insert__Group__0 : rule__Insert__Group__0__Impl rule__Insert__Group__1 ; - public final void rule__Insert__Group__0() throws RecognitionException { + // $ANTLR start "rule__Library__Group__0" + // InternalTqcl.g:897:1: rule__Library__Group__0 : rule__Library__Group__0__Impl rule__Library__Group__1 ; + public final void rule__Library__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:827:1: ( rule__Insert__Group__0__Impl rule__Insert__Group__1 ) - // InternalTqcl.g:828:2: rule__Insert__Group__0__Impl rule__Insert__Group__1 + // InternalTqcl.g:901:1: ( rule__Library__Group__0__Impl rule__Library__Group__1 ) + // InternalTqcl.g:902:2: rule__Library__Group__0__Impl rule__Library__Group__1 { pushFollow(FOLLOW_9); - rule__Insert__Group__0__Impl(); + rule__Library__Group__0__Impl(); state._fsp--; pushFollow(FOLLOW_2); - rule__Insert__Group__1(); + rule__Library__Group__1(); state._fsp--; @@ -2574,27 +2832,257 @@ public final void rule__Insert__Group__0() throws RecognitionException { } return ; } - // $ANTLR end "rule__Insert__Group__0" + // $ANTLR end "rule__Library__Group__0" - // $ANTLR start "rule__Insert__Group__0__Impl" - // InternalTqcl.g:835:1: rule__Insert__Group__0__Impl : ( 'insert' ) ; - public final void rule__Insert__Group__0__Impl() throws RecognitionException { + // $ANTLR start "rule__Library__Group__0__Impl" + // InternalTqcl.g:909:1: rule__Library__Group__0__Impl : ( 'library' ) ; + public final void rule__Library__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:839:1: ( ( 'insert' ) ) - // InternalTqcl.g:840:1: ( 'insert' ) + // InternalTqcl.g:913:1: ( ( 'library' ) ) + // InternalTqcl.g:914:1: ( 'library' ) { - // InternalTqcl.g:840:1: ( 'insert' ) - // InternalTqcl.g:841:2: 'insert' + // InternalTqcl.g:914:1: ( 'library' ) + // InternalTqcl.g:915:2: 'library' { - before(grammarAccess.getInsertAccess().getInsertKeyword_0()); - match(input,20,FOLLOW_2); - after(grammarAccess.getInsertAccess().getInsertKeyword_0()); - - } + before(grammarAccess.getLibraryAccess().getLibraryKeyword_0()); + match(input,19,FOLLOW_2); + after(grammarAccess.getLibraryAccess().getLibraryKeyword_0()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Library__Group__0__Impl" + + + // $ANTLR start "rule__Library__Group__1" + // InternalTqcl.g:924:1: rule__Library__Group__1 : rule__Library__Group__1__Impl rule__Library__Group__2 ; + public final void rule__Library__Group__1() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:928:1: ( rule__Library__Group__1__Impl rule__Library__Group__2 ) + // InternalTqcl.g:929:2: rule__Library__Group__1__Impl rule__Library__Group__2 + { + pushFollow(FOLLOW_7); + rule__Library__Group__1__Impl(); + + state._fsp--; + + pushFollow(FOLLOW_2); + rule__Library__Group__2(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Library__Group__1" + + + // $ANTLR start "rule__Library__Group__1__Impl" + // InternalTqcl.g:936:1: rule__Library__Group__1__Impl : ( ( rule__Library__NameAssignment_1 ) ) ; + public final void rule__Library__Group__1__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:940:1: ( ( ( rule__Library__NameAssignment_1 ) ) ) + // InternalTqcl.g:941:1: ( ( rule__Library__NameAssignment_1 ) ) + { + // InternalTqcl.g:941:1: ( ( rule__Library__NameAssignment_1 ) ) + // InternalTqcl.g:942:2: ( rule__Library__NameAssignment_1 ) + { + before(grammarAccess.getLibraryAccess().getNameAssignment_1()); + // InternalTqcl.g:943:2: ( rule__Library__NameAssignment_1 ) + // InternalTqcl.g:943:3: rule__Library__NameAssignment_1 + { + pushFollow(FOLLOW_2); + rule__Library__NameAssignment_1(); + + state._fsp--; + + + } + + after(grammarAccess.getLibraryAccess().getNameAssignment_1()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Library__Group__1__Impl" + + + // $ANTLR start "rule__Library__Group__2" + // InternalTqcl.g:951:1: rule__Library__Group__2 : rule__Library__Group__2__Impl ; + public final void rule__Library__Group__2() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:955:1: ( rule__Library__Group__2__Impl ) + // InternalTqcl.g:956:2: rule__Library__Group__2__Impl + { + pushFollow(FOLLOW_2); + rule__Library__Group__2__Impl(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Library__Group__2" + + + // $ANTLR start "rule__Library__Group__2__Impl" + // InternalTqcl.g:962:1: rule__Library__Group__2__Impl : ( ';' ) ; + public final void rule__Library__Group__2__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:966:1: ( ( ';' ) ) + // InternalTqcl.g:967:1: ( ';' ) + { + // InternalTqcl.g:967:1: ( ';' ) + // InternalTqcl.g:968:2: ';' + { + before(grammarAccess.getLibraryAccess().getSemicolonKeyword_2()); + match(input,17,FOLLOW_2); + after(grammarAccess.getLibraryAccess().getSemicolonKeyword_2()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Library__Group__2__Impl" + + + // $ANTLR start "rule__Insert__Group__0" + // InternalTqcl.g:978:1: rule__Insert__Group__0 : rule__Insert__Group__0__Impl rule__Insert__Group__1 ; + public final void rule__Insert__Group__0() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:982:1: ( rule__Insert__Group__0__Impl rule__Insert__Group__1 ) + // InternalTqcl.g:983:2: rule__Insert__Group__0__Impl rule__Insert__Group__1 + { + pushFollow(FOLLOW_10); + rule__Insert__Group__0__Impl(); + + state._fsp--; + + pushFollow(FOLLOW_2); + rule__Insert__Group__1(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__Insert__Group__0" + + + // $ANTLR start "rule__Insert__Group__0__Impl" + // InternalTqcl.g:990:1: rule__Insert__Group__0__Impl : ( 'insert' ) ; + public final void rule__Insert__Group__0__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:994:1: ( ( 'insert' ) ) + // InternalTqcl.g:995:1: ( 'insert' ) + { + // InternalTqcl.g:995:1: ( 'insert' ) + // InternalTqcl.g:996:2: 'insert' + { + before(grammarAccess.getInsertAccess().getInsertKeyword_0()); + match(input,20,FOLLOW_2); + after(grammarAccess.getInsertAccess().getInsertKeyword_0()); + + } } @@ -2615,16 +3103,16 @@ public final void rule__Insert__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group__1" - // InternalTqcl.g:850:1: rule__Insert__Group__1 : rule__Insert__Group__1__Impl rule__Insert__Group__2 ; + // InternalTqcl.g:1005:1: rule__Insert__Group__1 : rule__Insert__Group__1__Impl rule__Insert__Group__2 ; public final void rule__Insert__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:854:1: ( rule__Insert__Group__1__Impl rule__Insert__Group__2 ) - // InternalTqcl.g:855:2: rule__Insert__Group__1__Impl rule__Insert__Group__2 + // InternalTqcl.g:1009:1: ( rule__Insert__Group__1__Impl rule__Insert__Group__2 ) + // InternalTqcl.g:1010:2: rule__Insert__Group__1__Impl rule__Insert__Group__2 { - pushFollow(FOLLOW_9); + pushFollow(FOLLOW_10); rule__Insert__Group__1__Impl(); state._fsp--; @@ -2653,29 +3141,29 @@ public final void rule__Insert__Group__1() throws RecognitionException { // $ANTLR start "rule__Insert__Group__1__Impl" - // InternalTqcl.g:862:1: rule__Insert__Group__1__Impl : ( ( rule__Insert__CategoryAssignment_1 )? ) ; + // InternalTqcl.g:1017:1: rule__Insert__Group__1__Impl : ( ( rule__Insert__CategoryAssignment_1 )? ) ; public final void rule__Insert__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:866:1: ( ( ( rule__Insert__CategoryAssignment_1 )? ) ) - // InternalTqcl.g:867:1: ( ( rule__Insert__CategoryAssignment_1 )? ) + // InternalTqcl.g:1021:1: ( ( ( rule__Insert__CategoryAssignment_1 )? ) ) + // InternalTqcl.g:1022:1: ( ( rule__Insert__CategoryAssignment_1 )? ) { - // InternalTqcl.g:867:1: ( ( rule__Insert__CategoryAssignment_1 )? ) - // InternalTqcl.g:868:2: ( rule__Insert__CategoryAssignment_1 )? + // InternalTqcl.g:1022:1: ( ( rule__Insert__CategoryAssignment_1 )? ) + // InternalTqcl.g:1023:2: ( rule__Insert__CategoryAssignment_1 )? { before(grammarAccess.getInsertAccess().getCategoryAssignment_1()); - // InternalTqcl.g:869:2: ( rule__Insert__CategoryAssignment_1 )? - int alt7=2; - int LA7_0 = input.LA(1); + // InternalTqcl.g:1024:2: ( rule__Insert__CategoryAssignment_1 )? + int alt9=2; + int LA9_0 = input.LA(1); - if ( ((LA7_0>=13 && LA7_0<=16)) ) { - alt7=1; + if ( ((LA9_0>=13 && LA9_0<=16)) ) { + alt9=1; } - switch (alt7) { + switch (alt9) { case 1 : - // InternalTqcl.g:869:3: rule__Insert__CategoryAssignment_1 + // InternalTqcl.g:1024:3: rule__Insert__CategoryAssignment_1 { pushFollow(FOLLOW_2); rule__Insert__CategoryAssignment_1(); @@ -2711,16 +3199,16 @@ public final void rule__Insert__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group__2" - // InternalTqcl.g:877:1: rule__Insert__Group__2 : rule__Insert__Group__2__Impl rule__Insert__Group__3 ; + // InternalTqcl.g:1032:1: rule__Insert__Group__2 : rule__Insert__Group__2__Impl rule__Insert__Group__3 ; public final void rule__Insert__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:881:1: ( rule__Insert__Group__2__Impl rule__Insert__Group__3 ) - // InternalTqcl.g:882:2: rule__Insert__Group__2__Impl rule__Insert__Group__3 + // InternalTqcl.g:1036:1: ( rule__Insert__Group__2__Impl rule__Insert__Group__3 ) + // InternalTqcl.g:1037:2: rule__Insert__Group__2__Impl rule__Insert__Group__3 { - pushFollow(FOLLOW_10); + pushFollow(FOLLOW_11); rule__Insert__Group__2__Impl(); state._fsp--; @@ -2749,21 +3237,21 @@ public final void rule__Insert__Group__2() throws RecognitionException { // $ANTLR start "rule__Insert__Group__2__Impl" - // InternalTqcl.g:889:1: rule__Insert__Group__2__Impl : ( ( rule__Insert__EntityClassAssignment_2 ) ) ; + // InternalTqcl.g:1044:1: rule__Insert__Group__2__Impl : ( ( rule__Insert__EntityClassAssignment_2 ) ) ; public final void rule__Insert__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:893:1: ( ( ( rule__Insert__EntityClassAssignment_2 ) ) ) - // InternalTqcl.g:894:1: ( ( rule__Insert__EntityClassAssignment_2 ) ) + // InternalTqcl.g:1048:1: ( ( ( rule__Insert__EntityClassAssignment_2 ) ) ) + // InternalTqcl.g:1049:1: ( ( rule__Insert__EntityClassAssignment_2 ) ) { - // InternalTqcl.g:894:1: ( ( rule__Insert__EntityClassAssignment_2 ) ) - // InternalTqcl.g:895:2: ( rule__Insert__EntityClassAssignment_2 ) + // InternalTqcl.g:1049:1: ( ( rule__Insert__EntityClassAssignment_2 ) ) + // InternalTqcl.g:1050:2: ( rule__Insert__EntityClassAssignment_2 ) { before(grammarAccess.getInsertAccess().getEntityClassAssignment_2()); - // InternalTqcl.g:896:2: ( rule__Insert__EntityClassAssignment_2 ) - // InternalTqcl.g:896:3: rule__Insert__EntityClassAssignment_2 + // InternalTqcl.g:1051:2: ( rule__Insert__EntityClassAssignment_2 ) + // InternalTqcl.g:1051:3: rule__Insert__EntityClassAssignment_2 { pushFollow(FOLLOW_2); rule__Insert__EntityClassAssignment_2(); @@ -2796,16 +3284,16 @@ public final void rule__Insert__Group__2__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group__3" - // InternalTqcl.g:904:1: rule__Insert__Group__3 : rule__Insert__Group__3__Impl rule__Insert__Group__4 ; + // InternalTqcl.g:1059:1: rule__Insert__Group__3 : rule__Insert__Group__3__Impl rule__Insert__Group__4 ; public final void rule__Insert__Group__3() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:908:1: ( rule__Insert__Group__3__Impl rule__Insert__Group__4 ) - // InternalTqcl.g:909:2: rule__Insert__Group__3__Impl rule__Insert__Group__4 + // InternalTqcl.g:1063:1: ( rule__Insert__Group__3__Impl rule__Insert__Group__4 ) + // InternalTqcl.g:1064:2: rule__Insert__Group__3__Impl rule__Insert__Group__4 { - pushFollow(FOLLOW_7); + pushFollow(FOLLOW_8); rule__Insert__Group__3__Impl(); state._fsp--; @@ -2834,17 +3322,17 @@ public final void rule__Insert__Group__3() throws RecognitionException { // $ANTLR start "rule__Insert__Group__3__Impl" - // InternalTqcl.g:916:1: rule__Insert__Group__3__Impl : ( 'as' ) ; + // InternalTqcl.g:1071:1: rule__Insert__Group__3__Impl : ( 'as' ) ; public final void rule__Insert__Group__3__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:920:1: ( ( 'as' ) ) - // InternalTqcl.g:921:1: ( 'as' ) + // InternalTqcl.g:1075:1: ( ( 'as' ) ) + // InternalTqcl.g:1076:1: ( 'as' ) { - // InternalTqcl.g:921:1: ( 'as' ) - // InternalTqcl.g:922:2: 'as' + // InternalTqcl.g:1076:1: ( 'as' ) + // InternalTqcl.g:1077:2: 'as' { before(grammarAccess.getInsertAccess().getAsKeyword_3()); match(input,21,FOLLOW_2); @@ -2871,16 +3359,16 @@ public final void rule__Insert__Group__3__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group__4" - // InternalTqcl.g:931:1: rule__Insert__Group__4 : rule__Insert__Group__4__Impl rule__Insert__Group__5 ; + // InternalTqcl.g:1086:1: rule__Insert__Group__4 : rule__Insert__Group__4__Impl rule__Insert__Group__5 ; public final void rule__Insert__Group__4() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:935:1: ( rule__Insert__Group__4__Impl rule__Insert__Group__5 ) - // InternalTqcl.g:936:2: rule__Insert__Group__4__Impl rule__Insert__Group__5 + // InternalTqcl.g:1090:1: ( rule__Insert__Group__4__Impl rule__Insert__Group__5 ) + // InternalTqcl.g:1091:2: rule__Insert__Group__4__Impl rule__Insert__Group__5 { - pushFollow(FOLLOW_11); + pushFollow(FOLLOW_12); rule__Insert__Group__4__Impl(); state._fsp--; @@ -2909,21 +3397,21 @@ public final void rule__Insert__Group__4() throws RecognitionException { // $ANTLR start "rule__Insert__Group__4__Impl" - // InternalTqcl.g:943:1: rule__Insert__Group__4__Impl : ( ( rule__Insert__NameAssignment_4 ) ) ; + // InternalTqcl.g:1098:1: rule__Insert__Group__4__Impl : ( ( rule__Insert__NameAssignment_4 ) ) ; public final void rule__Insert__Group__4__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:947:1: ( ( ( rule__Insert__NameAssignment_4 ) ) ) - // InternalTqcl.g:948:1: ( ( rule__Insert__NameAssignment_4 ) ) + // InternalTqcl.g:1102:1: ( ( ( rule__Insert__NameAssignment_4 ) ) ) + // InternalTqcl.g:1103:1: ( ( rule__Insert__NameAssignment_4 ) ) { - // InternalTqcl.g:948:1: ( ( rule__Insert__NameAssignment_4 ) ) - // InternalTqcl.g:949:2: ( rule__Insert__NameAssignment_4 ) + // InternalTqcl.g:1103:1: ( ( rule__Insert__NameAssignment_4 ) ) + // InternalTqcl.g:1104:2: ( rule__Insert__NameAssignment_4 ) { before(grammarAccess.getInsertAccess().getNameAssignment_4()); - // InternalTqcl.g:950:2: ( rule__Insert__NameAssignment_4 ) - // InternalTqcl.g:950:3: rule__Insert__NameAssignment_4 + // InternalTqcl.g:1105:2: ( rule__Insert__NameAssignment_4 ) + // InternalTqcl.g:1105:3: rule__Insert__NameAssignment_4 { pushFollow(FOLLOW_2); rule__Insert__NameAssignment_4(); @@ -2956,14 +3444,14 @@ public final void rule__Insert__Group__4__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group__5" - // InternalTqcl.g:958:1: rule__Insert__Group__5 : rule__Insert__Group__5__Impl ; + // InternalTqcl.g:1113:1: rule__Insert__Group__5 : rule__Insert__Group__5__Impl ; public final void rule__Insert__Group__5() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:962:1: ( rule__Insert__Group__5__Impl ) - // InternalTqcl.g:963:2: rule__Insert__Group__5__Impl + // InternalTqcl.g:1117:1: ( rule__Insert__Group__5__Impl ) + // InternalTqcl.g:1118:2: rule__Insert__Group__5__Impl { pushFollow(FOLLOW_2); rule__Insert__Group__5__Impl(); @@ -2989,29 +3477,29 @@ public final void rule__Insert__Group__5() throws RecognitionException { // $ANTLR start "rule__Insert__Group__5__Impl" - // InternalTqcl.g:969:1: rule__Insert__Group__5__Impl : ( ( rule__Insert__Group_5__0 )? ) ; + // InternalTqcl.g:1124:1: rule__Insert__Group__5__Impl : ( ( rule__Insert__Group_5__0 )? ) ; public final void rule__Insert__Group__5__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:973:1: ( ( ( rule__Insert__Group_5__0 )? ) ) - // InternalTqcl.g:974:1: ( ( rule__Insert__Group_5__0 )? ) + // InternalTqcl.g:1128:1: ( ( ( rule__Insert__Group_5__0 )? ) ) + // InternalTqcl.g:1129:1: ( ( rule__Insert__Group_5__0 )? ) { - // InternalTqcl.g:974:1: ( ( rule__Insert__Group_5__0 )? ) - // InternalTqcl.g:975:2: ( rule__Insert__Group_5__0 )? + // InternalTqcl.g:1129:1: ( ( rule__Insert__Group_5__0 )? ) + // InternalTqcl.g:1130:2: ( rule__Insert__Group_5__0 )? { before(grammarAccess.getInsertAccess().getGroup_5()); - // InternalTqcl.g:976:2: ( rule__Insert__Group_5__0 )? - int alt8=2; - int LA8_0 = input.LA(1); + // InternalTqcl.g:1131:2: ( rule__Insert__Group_5__0 )? + int alt10=2; + int LA10_0 = input.LA(1); - if ( (LA8_0==22) ) { - alt8=1; + if ( (LA10_0==22) ) { + alt10=1; } - switch (alt8) { + switch (alt10) { case 1 : - // InternalTqcl.g:976:3: rule__Insert__Group_5__0 + // InternalTqcl.g:1131:3: rule__Insert__Group_5__0 { pushFollow(FOLLOW_2); rule__Insert__Group_5__0(); @@ -3047,16 +3535,16 @@ public final void rule__Insert__Group__5__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__0" - // InternalTqcl.g:985:1: rule__Insert__Group_5__0 : rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 ; + // InternalTqcl.g:1140:1: rule__Insert__Group_5__0 : rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 ; public final void rule__Insert__Group_5__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:989:1: ( rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 ) - // InternalTqcl.g:990:2: rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 + // InternalTqcl.g:1144:1: ( rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 ) + // InternalTqcl.g:1145:2: rule__Insert__Group_5__0__Impl rule__Insert__Group_5__1 { - pushFollow(FOLLOW_12); + pushFollow(FOLLOW_13); rule__Insert__Group_5__0__Impl(); state._fsp--; @@ -3085,17 +3573,17 @@ public final void rule__Insert__Group_5__0() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__0__Impl" - // InternalTqcl.g:997:1: rule__Insert__Group_5__0__Impl : ( 'with' ) ; + // InternalTqcl.g:1152:1: rule__Insert__Group_5__0__Impl : ( 'with' ) ; public final void rule__Insert__Group_5__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1001:1: ( ( 'with' ) ) - // InternalTqcl.g:1002:1: ( 'with' ) + // InternalTqcl.g:1156:1: ( ( 'with' ) ) + // InternalTqcl.g:1157:1: ( 'with' ) { - // InternalTqcl.g:1002:1: ( 'with' ) - // InternalTqcl.g:1003:2: 'with' + // InternalTqcl.g:1157:1: ( 'with' ) + // InternalTqcl.g:1158:2: 'with' { before(grammarAccess.getInsertAccess().getWithKeyword_5_0()); match(input,22,FOLLOW_2); @@ -3122,16 +3610,16 @@ public final void rule__Insert__Group_5__0__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__1" - // InternalTqcl.g:1012:1: rule__Insert__Group_5__1 : rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 ; + // InternalTqcl.g:1167:1: rule__Insert__Group_5__1 : rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 ; public final void rule__Insert__Group_5__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1016:1: ( rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 ) - // InternalTqcl.g:1017:2: rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 + // InternalTqcl.g:1171:1: ( rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 ) + // InternalTqcl.g:1172:2: rule__Insert__Group_5__1__Impl rule__Insert__Group_5__2 { - pushFollow(FOLLOW_13); + pushFollow(FOLLOW_14); rule__Insert__Group_5__1__Impl(); state._fsp--; @@ -3160,21 +3648,21 @@ public final void rule__Insert__Group_5__1() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__1__Impl" - // InternalTqcl.g:1024:1: rule__Insert__Group_5__1__Impl : ( ( rule__Insert__ParametersAssignment_5_1 ) ) ; + // InternalTqcl.g:1179:1: rule__Insert__Group_5__1__Impl : ( ( rule__Insert__ParametersAssignment_5_1 ) ) ; public final void rule__Insert__Group_5__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1028:1: ( ( ( rule__Insert__ParametersAssignment_5_1 ) ) ) - // InternalTqcl.g:1029:1: ( ( rule__Insert__ParametersAssignment_5_1 ) ) + // InternalTqcl.g:1183:1: ( ( ( rule__Insert__ParametersAssignment_5_1 ) ) ) + // InternalTqcl.g:1184:1: ( ( rule__Insert__ParametersAssignment_5_1 ) ) { - // InternalTqcl.g:1029:1: ( ( rule__Insert__ParametersAssignment_5_1 ) ) - // InternalTqcl.g:1030:2: ( rule__Insert__ParametersAssignment_5_1 ) + // InternalTqcl.g:1184:1: ( ( rule__Insert__ParametersAssignment_5_1 ) ) + // InternalTqcl.g:1185:2: ( rule__Insert__ParametersAssignment_5_1 ) { before(grammarAccess.getInsertAccess().getParametersAssignment_5_1()); - // InternalTqcl.g:1031:2: ( rule__Insert__ParametersAssignment_5_1 ) - // InternalTqcl.g:1031:3: rule__Insert__ParametersAssignment_5_1 + // InternalTqcl.g:1186:2: ( rule__Insert__ParametersAssignment_5_1 ) + // InternalTqcl.g:1186:3: rule__Insert__ParametersAssignment_5_1 { pushFollow(FOLLOW_2); rule__Insert__ParametersAssignment_5_1(); @@ -3207,14 +3695,14 @@ public final void rule__Insert__Group_5__1__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__2" - // InternalTqcl.g:1039:1: rule__Insert__Group_5__2 : rule__Insert__Group_5__2__Impl ; + // InternalTqcl.g:1194:1: rule__Insert__Group_5__2 : rule__Insert__Group_5__2__Impl ; public final void rule__Insert__Group_5__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1043:1: ( rule__Insert__Group_5__2__Impl ) - // InternalTqcl.g:1044:2: rule__Insert__Group_5__2__Impl + // InternalTqcl.g:1198:1: ( rule__Insert__Group_5__2__Impl ) + // InternalTqcl.g:1199:2: rule__Insert__Group_5__2__Impl { pushFollow(FOLLOW_2); rule__Insert__Group_5__2__Impl(); @@ -3240,35 +3728,35 @@ public final void rule__Insert__Group_5__2() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5__2__Impl" - // InternalTqcl.g:1050:1: rule__Insert__Group_5__2__Impl : ( ( rule__Insert__Group_5_2__0 )* ) ; + // InternalTqcl.g:1205:1: rule__Insert__Group_5__2__Impl : ( ( rule__Insert__Group_5_2__0 )* ) ; public final void rule__Insert__Group_5__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1054:1: ( ( ( rule__Insert__Group_5_2__0 )* ) ) - // InternalTqcl.g:1055:1: ( ( rule__Insert__Group_5_2__0 )* ) + // InternalTqcl.g:1209:1: ( ( ( rule__Insert__Group_5_2__0 )* ) ) + // InternalTqcl.g:1210:1: ( ( rule__Insert__Group_5_2__0 )* ) { - // InternalTqcl.g:1055:1: ( ( rule__Insert__Group_5_2__0 )* ) - // InternalTqcl.g:1056:2: ( rule__Insert__Group_5_2__0 )* + // InternalTqcl.g:1210:1: ( ( rule__Insert__Group_5_2__0 )* ) + // InternalTqcl.g:1211:2: ( rule__Insert__Group_5_2__0 )* { before(grammarAccess.getInsertAccess().getGroup_5_2()); - // InternalTqcl.g:1057:2: ( rule__Insert__Group_5_2__0 )* - loop9: + // InternalTqcl.g:1212:2: ( rule__Insert__Group_5_2__0 )* + loop11: do { - int alt9=2; - int LA9_0 = input.LA(1); + int alt11=2; + int LA11_0 = input.LA(1); - if ( (LA9_0==23) ) { - alt9=1; + if ( (LA11_0==23) ) { + alt11=1; } - switch (alt9) { + switch (alt11) { case 1 : - // InternalTqcl.g:1057:3: rule__Insert__Group_5_2__0 + // InternalTqcl.g:1212:3: rule__Insert__Group_5_2__0 { - pushFollow(FOLLOW_14); + pushFollow(FOLLOW_15); rule__Insert__Group_5_2__0(); state._fsp--; @@ -3278,7 +3766,7 @@ public final void rule__Insert__Group_5__2__Impl() throws RecognitionException { break; default : - break loop9; + break loop11; } } while (true); @@ -3305,16 +3793,16 @@ public final void rule__Insert__Group_5__2__Impl() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5_2__0" - // InternalTqcl.g:1066:1: rule__Insert__Group_5_2__0 : rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 ; + // InternalTqcl.g:1221:1: rule__Insert__Group_5_2__0 : rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 ; public final void rule__Insert__Group_5_2__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1070:1: ( rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 ) - // InternalTqcl.g:1071:2: rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 + // InternalTqcl.g:1225:1: ( rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 ) + // InternalTqcl.g:1226:2: rule__Insert__Group_5_2__0__Impl rule__Insert__Group_5_2__1 { - pushFollow(FOLLOW_12); + pushFollow(FOLLOW_13); rule__Insert__Group_5_2__0__Impl(); state._fsp--; @@ -3343,17 +3831,17 @@ public final void rule__Insert__Group_5_2__0() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5_2__0__Impl" - // InternalTqcl.g:1078:1: rule__Insert__Group_5_2__0__Impl : ( ',' ) ; + // InternalTqcl.g:1233:1: rule__Insert__Group_5_2__0__Impl : ( ',' ) ; public final void rule__Insert__Group_5_2__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1082:1: ( ( ',' ) ) - // InternalTqcl.g:1083:1: ( ',' ) + // InternalTqcl.g:1237:1: ( ( ',' ) ) + // InternalTqcl.g:1238:1: ( ',' ) { - // InternalTqcl.g:1083:1: ( ',' ) - // InternalTqcl.g:1084:2: ',' + // InternalTqcl.g:1238:1: ( ',' ) + // InternalTqcl.g:1239:2: ',' { before(grammarAccess.getInsertAccess().getCommaKeyword_5_2_0()); match(input,23,FOLLOW_2); @@ -3380,14 +3868,14 @@ public final void rule__Insert__Group_5_2__0__Impl() throws RecognitionException // $ANTLR start "rule__Insert__Group_5_2__1" - // InternalTqcl.g:1093:1: rule__Insert__Group_5_2__1 : rule__Insert__Group_5_2__1__Impl ; + // InternalTqcl.g:1248:1: rule__Insert__Group_5_2__1 : rule__Insert__Group_5_2__1__Impl ; public final void rule__Insert__Group_5_2__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1097:1: ( rule__Insert__Group_5_2__1__Impl ) - // InternalTqcl.g:1098:2: rule__Insert__Group_5_2__1__Impl + // InternalTqcl.g:1252:1: ( rule__Insert__Group_5_2__1__Impl ) + // InternalTqcl.g:1253:2: rule__Insert__Group_5_2__1__Impl { pushFollow(FOLLOW_2); rule__Insert__Group_5_2__1__Impl(); @@ -3413,21 +3901,21 @@ public final void rule__Insert__Group_5_2__1() throws RecognitionException { // $ANTLR start "rule__Insert__Group_5_2__1__Impl" - // InternalTqcl.g:1104:1: rule__Insert__Group_5_2__1__Impl : ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) ; + // InternalTqcl.g:1259:1: rule__Insert__Group_5_2__1__Impl : ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) ; public final void rule__Insert__Group_5_2__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1108:1: ( ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) ) - // InternalTqcl.g:1109:1: ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) + // InternalTqcl.g:1263:1: ( ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) ) + // InternalTqcl.g:1264:1: ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) { - // InternalTqcl.g:1109:1: ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) - // InternalTqcl.g:1110:2: ( rule__Insert__ParametersAssignment_5_2_1 ) + // InternalTqcl.g:1264:1: ( ( rule__Insert__ParametersAssignment_5_2_1 ) ) + // InternalTqcl.g:1265:2: ( rule__Insert__ParametersAssignment_5_2_1 ) { before(grammarAccess.getInsertAccess().getParametersAssignment_5_2_1()); - // InternalTqcl.g:1111:2: ( rule__Insert__ParametersAssignment_5_2_1 ) - // InternalTqcl.g:1111:3: rule__Insert__ParametersAssignment_5_2_1 + // InternalTqcl.g:1266:2: ( rule__Insert__ParametersAssignment_5_2_1 ) + // InternalTqcl.g:1266:3: rule__Insert__ParametersAssignment_5_2_1 { pushFollow(FOLLOW_2); rule__Insert__ParametersAssignment_5_2_1(); @@ -3460,16 +3948,16 @@ public final void rule__Insert__Group_5_2__1__Impl() throws RecognitionException // $ANTLR start "rule__Set__Group__0" - // InternalTqcl.g:1120:1: rule__Set__Group__0 : rule__Set__Group__0__Impl rule__Set__Group__1 ; + // InternalTqcl.g:1275:1: rule__Set__Group__0 : rule__Set__Group__0__Impl rule__Set__Group__1 ; public final void rule__Set__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1124:1: ( rule__Set__Group__0__Impl rule__Set__Group__1 ) - // InternalTqcl.g:1125:2: rule__Set__Group__0__Impl rule__Set__Group__1 + // InternalTqcl.g:1279:1: ( rule__Set__Group__0__Impl rule__Set__Group__1 ) + // InternalTqcl.g:1280:2: rule__Set__Group__0__Impl rule__Set__Group__1 { - pushFollow(FOLLOW_12); + pushFollow(FOLLOW_13); rule__Set__Group__0__Impl(); state._fsp--; @@ -3498,17 +3986,17 @@ public final void rule__Set__Group__0() throws RecognitionException { // $ANTLR start "rule__Set__Group__0__Impl" - // InternalTqcl.g:1132:1: rule__Set__Group__0__Impl : ( 'set' ) ; + // InternalTqcl.g:1287:1: rule__Set__Group__0__Impl : ( 'set' ) ; public final void rule__Set__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1136:1: ( ( 'set' ) ) - // InternalTqcl.g:1137:1: ( 'set' ) + // InternalTqcl.g:1291:1: ( ( 'set' ) ) + // InternalTqcl.g:1292:1: ( 'set' ) { - // InternalTqcl.g:1137:1: ( 'set' ) - // InternalTqcl.g:1138:2: 'set' + // InternalTqcl.g:1292:1: ( 'set' ) + // InternalTqcl.g:1293:2: 'set' { before(grammarAccess.getSetAccess().getSetKeyword_0()); match(input,24,FOLLOW_2); @@ -3535,14 +4023,14 @@ public final void rule__Set__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__Set__Group__1" - // InternalTqcl.g:1147:1: rule__Set__Group__1 : rule__Set__Group__1__Impl ; + // InternalTqcl.g:1302:1: rule__Set__Group__1 : rule__Set__Group__1__Impl ; public final void rule__Set__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1151:1: ( rule__Set__Group__1__Impl ) - // InternalTqcl.g:1152:2: rule__Set__Group__1__Impl + // InternalTqcl.g:1306:1: ( rule__Set__Group__1__Impl ) + // InternalTqcl.g:1307:2: rule__Set__Group__1__Impl { pushFollow(FOLLOW_2); rule__Set__Group__1__Impl(); @@ -3568,21 +4056,21 @@ public final void rule__Set__Group__1() throws RecognitionException { // $ANTLR start "rule__Set__Group__1__Impl" - // InternalTqcl.g:1158:1: rule__Set__Group__1__Impl : ( ( rule__Set__ParamAssignment_1 ) ) ; + // InternalTqcl.g:1313:1: rule__Set__Group__1__Impl : ( ( rule__Set__ParamAssignment_1 ) ) ; public final void rule__Set__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1162:1: ( ( ( rule__Set__ParamAssignment_1 ) ) ) - // InternalTqcl.g:1163:1: ( ( rule__Set__ParamAssignment_1 ) ) + // InternalTqcl.g:1317:1: ( ( ( rule__Set__ParamAssignment_1 ) ) ) + // InternalTqcl.g:1318:1: ( ( rule__Set__ParamAssignment_1 ) ) { - // InternalTqcl.g:1163:1: ( ( rule__Set__ParamAssignment_1 ) ) - // InternalTqcl.g:1164:2: ( rule__Set__ParamAssignment_1 ) + // InternalTqcl.g:1318:1: ( ( rule__Set__ParamAssignment_1 ) ) + // InternalTqcl.g:1319:2: ( rule__Set__ParamAssignment_1 ) { before(grammarAccess.getSetAccess().getParamAssignment_1()); - // InternalTqcl.g:1165:2: ( rule__Set__ParamAssignment_1 ) - // InternalTqcl.g:1165:3: rule__Set__ParamAssignment_1 + // InternalTqcl.g:1320:2: ( rule__Set__ParamAssignment_1 ) + // InternalTqcl.g:1320:3: rule__Set__ParamAssignment_1 { pushFollow(FOLLOW_2); rule__Set__ParamAssignment_1(); @@ -3615,16 +4103,16 @@ public final void rule__Set__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__0" - // InternalTqcl.g:1174:1: rule__Connect__Group__0 : rule__Connect__Group__0__Impl rule__Connect__Group__1 ; + // InternalTqcl.g:1329:1: rule__Connect__Group__0 : rule__Connect__Group__0__Impl rule__Connect__Group__1 ; public final void rule__Connect__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1178:1: ( rule__Connect__Group__0__Impl rule__Connect__Group__1 ) - // InternalTqcl.g:1179:2: rule__Connect__Group__0__Impl rule__Connect__Group__1 + // InternalTqcl.g:1333:1: ( rule__Connect__Group__0__Impl rule__Connect__Group__1 ) + // InternalTqcl.g:1334:2: rule__Connect__Group__0__Impl rule__Connect__Group__1 { - pushFollow(FOLLOW_8); + pushFollow(FOLLOW_9); rule__Connect__Group__0__Impl(); state._fsp--; @@ -3653,17 +4141,17 @@ public final void rule__Connect__Group__0() throws RecognitionException { // $ANTLR start "rule__Connect__Group__0__Impl" - // InternalTqcl.g:1186:1: rule__Connect__Group__0__Impl : ( 'connect' ) ; + // InternalTqcl.g:1341:1: rule__Connect__Group__0__Impl : ( 'connect' ) ; public final void rule__Connect__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1190:1: ( ( 'connect' ) ) - // InternalTqcl.g:1191:1: ( 'connect' ) + // InternalTqcl.g:1345:1: ( ( 'connect' ) ) + // InternalTqcl.g:1346:1: ( 'connect' ) { - // InternalTqcl.g:1191:1: ( 'connect' ) - // InternalTqcl.g:1192:2: 'connect' + // InternalTqcl.g:1346:1: ( 'connect' ) + // InternalTqcl.g:1347:2: 'connect' { before(grammarAccess.getConnectAccess().getConnectKeyword_0()); match(input,25,FOLLOW_2); @@ -3690,16 +4178,16 @@ public final void rule__Connect__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__1" - // InternalTqcl.g:1201:1: rule__Connect__Group__1 : rule__Connect__Group__1__Impl rule__Connect__Group__2 ; + // InternalTqcl.g:1356:1: rule__Connect__Group__1 : rule__Connect__Group__1__Impl rule__Connect__Group__2 ; public final void rule__Connect__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1205:1: ( rule__Connect__Group__1__Impl rule__Connect__Group__2 ) - // InternalTqcl.g:1206:2: rule__Connect__Group__1__Impl rule__Connect__Group__2 + // InternalTqcl.g:1360:1: ( rule__Connect__Group__1__Impl rule__Connect__Group__2 ) + // InternalTqcl.g:1361:2: rule__Connect__Group__1__Impl rule__Connect__Group__2 { - pushFollow(FOLLOW_15); + pushFollow(FOLLOW_16); rule__Connect__Group__1__Impl(); state._fsp--; @@ -3728,21 +4216,21 @@ public final void rule__Connect__Group__1() throws RecognitionException { // $ANTLR start "rule__Connect__Group__1__Impl" - // InternalTqcl.g:1213:1: rule__Connect__Group__1__Impl : ( ( rule__Connect__FromAssignment_1 ) ) ; + // InternalTqcl.g:1368:1: rule__Connect__Group__1__Impl : ( ( rule__Connect__FromAssignment_1 ) ) ; public final void rule__Connect__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1217:1: ( ( ( rule__Connect__FromAssignment_1 ) ) ) - // InternalTqcl.g:1218:1: ( ( rule__Connect__FromAssignment_1 ) ) + // InternalTqcl.g:1372:1: ( ( ( rule__Connect__FromAssignment_1 ) ) ) + // InternalTqcl.g:1373:1: ( ( rule__Connect__FromAssignment_1 ) ) { - // InternalTqcl.g:1218:1: ( ( rule__Connect__FromAssignment_1 ) ) - // InternalTqcl.g:1219:2: ( rule__Connect__FromAssignment_1 ) + // InternalTqcl.g:1373:1: ( ( rule__Connect__FromAssignment_1 ) ) + // InternalTqcl.g:1374:2: ( rule__Connect__FromAssignment_1 ) { before(grammarAccess.getConnectAccess().getFromAssignment_1()); - // InternalTqcl.g:1220:2: ( rule__Connect__FromAssignment_1 ) - // InternalTqcl.g:1220:3: rule__Connect__FromAssignment_1 + // InternalTqcl.g:1375:2: ( rule__Connect__FromAssignment_1 ) + // InternalTqcl.g:1375:3: rule__Connect__FromAssignment_1 { pushFollow(FOLLOW_2); rule__Connect__FromAssignment_1(); @@ -3775,16 +4263,16 @@ public final void rule__Connect__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__2" - // InternalTqcl.g:1228:1: rule__Connect__Group__2 : rule__Connect__Group__2__Impl rule__Connect__Group__3 ; + // InternalTqcl.g:1383:1: rule__Connect__Group__2 : rule__Connect__Group__2__Impl rule__Connect__Group__3 ; public final void rule__Connect__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1232:1: ( rule__Connect__Group__2__Impl rule__Connect__Group__3 ) - // InternalTqcl.g:1233:2: rule__Connect__Group__2__Impl rule__Connect__Group__3 + // InternalTqcl.g:1387:1: ( rule__Connect__Group__2__Impl rule__Connect__Group__3 ) + // InternalTqcl.g:1388:2: rule__Connect__Group__2__Impl rule__Connect__Group__3 { - pushFollow(FOLLOW_15); + pushFollow(FOLLOW_16); rule__Connect__Group__2__Impl(); state._fsp--; @@ -3813,35 +4301,35 @@ public final void rule__Connect__Group__2() throws RecognitionException { // $ANTLR start "rule__Connect__Group__2__Impl" - // InternalTqcl.g:1240:1: rule__Connect__Group__2__Impl : ( ( rule__Connect__Group_2__0 )* ) ; + // InternalTqcl.g:1395:1: rule__Connect__Group__2__Impl : ( ( rule__Connect__Group_2__0 )* ) ; public final void rule__Connect__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1244:1: ( ( ( rule__Connect__Group_2__0 )* ) ) - // InternalTqcl.g:1245:1: ( ( rule__Connect__Group_2__0 )* ) + // InternalTqcl.g:1399:1: ( ( ( rule__Connect__Group_2__0 )* ) ) + // InternalTqcl.g:1400:1: ( ( rule__Connect__Group_2__0 )* ) { - // InternalTqcl.g:1245:1: ( ( rule__Connect__Group_2__0 )* ) - // InternalTqcl.g:1246:2: ( rule__Connect__Group_2__0 )* + // InternalTqcl.g:1400:1: ( ( rule__Connect__Group_2__0 )* ) + // InternalTqcl.g:1401:2: ( rule__Connect__Group_2__0 )* { before(grammarAccess.getConnectAccess().getGroup_2()); - // InternalTqcl.g:1247:2: ( rule__Connect__Group_2__0 )* - loop10: + // InternalTqcl.g:1402:2: ( rule__Connect__Group_2__0 )* + loop12: do { - int alt10=2; - int LA10_0 = input.LA(1); + int alt12=2; + int LA12_0 = input.LA(1); - if ( (LA10_0==23) ) { - alt10=1; + if ( (LA12_0==23) ) { + alt12=1; } - switch (alt10) { + switch (alt12) { case 1 : - // InternalTqcl.g:1247:3: rule__Connect__Group_2__0 + // InternalTqcl.g:1402:3: rule__Connect__Group_2__0 { - pushFollow(FOLLOW_14); + pushFollow(FOLLOW_15); rule__Connect__Group_2__0(); state._fsp--; @@ -3851,7 +4339,7 @@ public final void rule__Connect__Group__2__Impl() throws RecognitionException { break; default : - break loop10; + break loop12; } } while (true); @@ -3878,16 +4366,16 @@ public final void rule__Connect__Group__2__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__3" - // InternalTqcl.g:1255:1: rule__Connect__Group__3 : rule__Connect__Group__3__Impl rule__Connect__Group__4 ; + // InternalTqcl.g:1410:1: rule__Connect__Group__3 : rule__Connect__Group__3__Impl rule__Connect__Group__4 ; public final void rule__Connect__Group__3() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1259:1: ( rule__Connect__Group__3__Impl rule__Connect__Group__4 ) - // InternalTqcl.g:1260:2: rule__Connect__Group__3__Impl rule__Connect__Group__4 + // InternalTqcl.g:1414:1: ( rule__Connect__Group__3__Impl rule__Connect__Group__4 ) + // InternalTqcl.g:1415:2: rule__Connect__Group__3__Impl rule__Connect__Group__4 { - pushFollow(FOLLOW_8); + pushFollow(FOLLOW_9); rule__Connect__Group__3__Impl(); state._fsp--; @@ -3916,17 +4404,17 @@ public final void rule__Connect__Group__3() throws RecognitionException { // $ANTLR start "rule__Connect__Group__3__Impl" - // InternalTqcl.g:1267:1: rule__Connect__Group__3__Impl : ( 'to' ) ; + // InternalTqcl.g:1422:1: rule__Connect__Group__3__Impl : ( 'to' ) ; public final void rule__Connect__Group__3__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1271:1: ( ( 'to' ) ) - // InternalTqcl.g:1272:1: ( 'to' ) + // InternalTqcl.g:1426:1: ( ( 'to' ) ) + // InternalTqcl.g:1427:1: ( 'to' ) { - // InternalTqcl.g:1272:1: ( 'to' ) - // InternalTqcl.g:1273:2: 'to' + // InternalTqcl.g:1427:1: ( 'to' ) + // InternalTqcl.g:1428:2: 'to' { before(grammarAccess.getConnectAccess().getToKeyword_3()); match(input,26,FOLLOW_2); @@ -3953,16 +4441,16 @@ public final void rule__Connect__Group__3__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__4" - // InternalTqcl.g:1282:1: rule__Connect__Group__4 : rule__Connect__Group__4__Impl rule__Connect__Group__5 ; + // InternalTqcl.g:1437:1: rule__Connect__Group__4 : rule__Connect__Group__4__Impl rule__Connect__Group__5 ; public final void rule__Connect__Group__4() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1286:1: ( rule__Connect__Group__4__Impl rule__Connect__Group__5 ) - // InternalTqcl.g:1287:2: rule__Connect__Group__4__Impl rule__Connect__Group__5 + // InternalTqcl.g:1441:1: ( rule__Connect__Group__4__Impl rule__Connect__Group__5 ) + // InternalTqcl.g:1442:2: rule__Connect__Group__4__Impl rule__Connect__Group__5 { - pushFollow(FOLLOW_13); + pushFollow(FOLLOW_14); rule__Connect__Group__4__Impl(); state._fsp--; @@ -3991,21 +4479,21 @@ public final void rule__Connect__Group__4() throws RecognitionException { // $ANTLR start "rule__Connect__Group__4__Impl" - // InternalTqcl.g:1294:1: rule__Connect__Group__4__Impl : ( ( rule__Connect__ToAssignment_4 ) ) ; + // InternalTqcl.g:1449:1: rule__Connect__Group__4__Impl : ( ( rule__Connect__ToAssignment_4 ) ) ; public final void rule__Connect__Group__4__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1298:1: ( ( ( rule__Connect__ToAssignment_4 ) ) ) - // InternalTqcl.g:1299:1: ( ( rule__Connect__ToAssignment_4 ) ) + // InternalTqcl.g:1453:1: ( ( ( rule__Connect__ToAssignment_4 ) ) ) + // InternalTqcl.g:1454:1: ( ( rule__Connect__ToAssignment_4 ) ) { - // InternalTqcl.g:1299:1: ( ( rule__Connect__ToAssignment_4 ) ) - // InternalTqcl.g:1300:2: ( rule__Connect__ToAssignment_4 ) + // InternalTqcl.g:1454:1: ( ( rule__Connect__ToAssignment_4 ) ) + // InternalTqcl.g:1455:2: ( rule__Connect__ToAssignment_4 ) { before(grammarAccess.getConnectAccess().getToAssignment_4()); - // InternalTqcl.g:1301:2: ( rule__Connect__ToAssignment_4 ) - // InternalTqcl.g:1301:3: rule__Connect__ToAssignment_4 + // InternalTqcl.g:1456:2: ( rule__Connect__ToAssignment_4 ) + // InternalTqcl.g:1456:3: rule__Connect__ToAssignment_4 { pushFollow(FOLLOW_2); rule__Connect__ToAssignment_4(); @@ -4038,14 +4526,14 @@ public final void rule__Connect__Group__4__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group__5" - // InternalTqcl.g:1309:1: rule__Connect__Group__5 : rule__Connect__Group__5__Impl ; + // InternalTqcl.g:1464:1: rule__Connect__Group__5 : rule__Connect__Group__5__Impl ; public final void rule__Connect__Group__5() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1313:1: ( rule__Connect__Group__5__Impl ) - // InternalTqcl.g:1314:2: rule__Connect__Group__5__Impl + // InternalTqcl.g:1468:1: ( rule__Connect__Group__5__Impl ) + // InternalTqcl.g:1469:2: rule__Connect__Group__5__Impl { pushFollow(FOLLOW_2); rule__Connect__Group__5__Impl(); @@ -4071,35 +4559,35 @@ public final void rule__Connect__Group__5() throws RecognitionException { // $ANTLR start "rule__Connect__Group__5__Impl" - // InternalTqcl.g:1320:1: rule__Connect__Group__5__Impl : ( ( rule__Connect__Group_5__0 )* ) ; + // InternalTqcl.g:1475:1: rule__Connect__Group__5__Impl : ( ( rule__Connect__Group_5__0 )* ) ; public final void rule__Connect__Group__5__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1324:1: ( ( ( rule__Connect__Group_5__0 )* ) ) - // InternalTqcl.g:1325:1: ( ( rule__Connect__Group_5__0 )* ) + // InternalTqcl.g:1479:1: ( ( ( rule__Connect__Group_5__0 )* ) ) + // InternalTqcl.g:1480:1: ( ( rule__Connect__Group_5__0 )* ) { - // InternalTqcl.g:1325:1: ( ( rule__Connect__Group_5__0 )* ) - // InternalTqcl.g:1326:2: ( rule__Connect__Group_5__0 )* + // InternalTqcl.g:1480:1: ( ( rule__Connect__Group_5__0 )* ) + // InternalTqcl.g:1481:2: ( rule__Connect__Group_5__0 )* { before(grammarAccess.getConnectAccess().getGroup_5()); - // InternalTqcl.g:1327:2: ( rule__Connect__Group_5__0 )* - loop11: + // InternalTqcl.g:1482:2: ( rule__Connect__Group_5__0 )* + loop13: do { - int alt11=2; - int LA11_0 = input.LA(1); + int alt13=2; + int LA13_0 = input.LA(1); - if ( (LA11_0==23) ) { - alt11=1; + if ( (LA13_0==23) ) { + alt13=1; } - switch (alt11) { + switch (alt13) { case 1 : - // InternalTqcl.g:1327:3: rule__Connect__Group_5__0 + // InternalTqcl.g:1482:3: rule__Connect__Group_5__0 { - pushFollow(FOLLOW_14); + pushFollow(FOLLOW_15); rule__Connect__Group_5__0(); state._fsp--; @@ -4109,7 +4597,7 @@ public final void rule__Connect__Group__5__Impl() throws RecognitionException { break; default : - break loop11; + break loop13; } } while (true); @@ -4136,16 +4624,16 @@ public final void rule__Connect__Group__5__Impl() throws RecognitionException { // $ANTLR start "rule__Connect__Group_2__0" - // InternalTqcl.g:1336:1: rule__Connect__Group_2__0 : rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 ; + // InternalTqcl.g:1491:1: rule__Connect__Group_2__0 : rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 ; public final void rule__Connect__Group_2__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1340:1: ( rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 ) - // InternalTqcl.g:1341:2: rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 + // InternalTqcl.g:1495:1: ( rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 ) + // InternalTqcl.g:1496:2: rule__Connect__Group_2__0__Impl rule__Connect__Group_2__1 { - pushFollow(FOLLOW_8); + pushFollow(FOLLOW_9); rule__Connect__Group_2__0__Impl(); state._fsp--; @@ -4174,17 +4662,17 @@ public final void rule__Connect__Group_2__0() throws RecognitionException { // $ANTLR start "rule__Connect__Group_2__0__Impl" - // InternalTqcl.g:1348:1: rule__Connect__Group_2__0__Impl : ( ',' ) ; + // InternalTqcl.g:1503:1: rule__Connect__Group_2__0__Impl : ( ',' ) ; public final void rule__Connect__Group_2__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1352:1: ( ( ',' ) ) - // InternalTqcl.g:1353:1: ( ',' ) + // InternalTqcl.g:1507:1: ( ( ',' ) ) + // InternalTqcl.g:1508:1: ( ',' ) { - // InternalTqcl.g:1353:1: ( ',' ) - // InternalTqcl.g:1354:2: ',' + // InternalTqcl.g:1508:1: ( ',' ) + // InternalTqcl.g:1509:2: ',' { before(grammarAccess.getConnectAccess().getCommaKeyword_2_0()); match(input,23,FOLLOW_2); @@ -4211,14 +4699,14 @@ public final void rule__Connect__Group_2__0__Impl() throws RecognitionException // $ANTLR start "rule__Connect__Group_2__1" - // InternalTqcl.g:1363:1: rule__Connect__Group_2__1 : rule__Connect__Group_2__1__Impl ; + // InternalTqcl.g:1518:1: rule__Connect__Group_2__1 : rule__Connect__Group_2__1__Impl ; public final void rule__Connect__Group_2__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1367:1: ( rule__Connect__Group_2__1__Impl ) - // InternalTqcl.g:1368:2: rule__Connect__Group_2__1__Impl + // InternalTqcl.g:1522:1: ( rule__Connect__Group_2__1__Impl ) + // InternalTqcl.g:1523:2: rule__Connect__Group_2__1__Impl { pushFollow(FOLLOW_2); rule__Connect__Group_2__1__Impl(); @@ -4244,21 +4732,21 @@ public final void rule__Connect__Group_2__1() throws RecognitionException { // $ANTLR start "rule__Connect__Group_2__1__Impl" - // InternalTqcl.g:1374:1: rule__Connect__Group_2__1__Impl : ( ( rule__Connect__FromAssignment_2_1 ) ) ; + // InternalTqcl.g:1529:1: rule__Connect__Group_2__1__Impl : ( ( rule__Connect__FromAssignment_2_1 ) ) ; public final void rule__Connect__Group_2__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1378:1: ( ( ( rule__Connect__FromAssignment_2_1 ) ) ) - // InternalTqcl.g:1379:1: ( ( rule__Connect__FromAssignment_2_1 ) ) + // InternalTqcl.g:1533:1: ( ( ( rule__Connect__FromAssignment_2_1 ) ) ) + // InternalTqcl.g:1534:1: ( ( rule__Connect__FromAssignment_2_1 ) ) { - // InternalTqcl.g:1379:1: ( ( rule__Connect__FromAssignment_2_1 ) ) - // InternalTqcl.g:1380:2: ( rule__Connect__FromAssignment_2_1 ) + // InternalTqcl.g:1534:1: ( ( rule__Connect__FromAssignment_2_1 ) ) + // InternalTqcl.g:1535:2: ( rule__Connect__FromAssignment_2_1 ) { before(grammarAccess.getConnectAccess().getFromAssignment_2_1()); - // InternalTqcl.g:1381:2: ( rule__Connect__FromAssignment_2_1 ) - // InternalTqcl.g:1381:3: rule__Connect__FromAssignment_2_1 + // InternalTqcl.g:1536:2: ( rule__Connect__FromAssignment_2_1 ) + // InternalTqcl.g:1536:3: rule__Connect__FromAssignment_2_1 { pushFollow(FOLLOW_2); rule__Connect__FromAssignment_2_1(); @@ -4291,16 +4779,16 @@ public final void rule__Connect__Group_2__1__Impl() throws RecognitionException // $ANTLR start "rule__Connect__Group_5__0" - // InternalTqcl.g:1390:1: rule__Connect__Group_5__0 : rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 ; + // InternalTqcl.g:1545:1: rule__Connect__Group_5__0 : rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 ; public final void rule__Connect__Group_5__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1394:1: ( rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 ) - // InternalTqcl.g:1395:2: rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 + // InternalTqcl.g:1549:1: ( rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 ) + // InternalTqcl.g:1550:2: rule__Connect__Group_5__0__Impl rule__Connect__Group_5__1 { - pushFollow(FOLLOW_8); + pushFollow(FOLLOW_9); rule__Connect__Group_5__0__Impl(); state._fsp--; @@ -4329,17 +4817,17 @@ public final void rule__Connect__Group_5__0() throws RecognitionException { // $ANTLR start "rule__Connect__Group_5__0__Impl" - // InternalTqcl.g:1402:1: rule__Connect__Group_5__0__Impl : ( ',' ) ; + // InternalTqcl.g:1557:1: rule__Connect__Group_5__0__Impl : ( ',' ) ; public final void rule__Connect__Group_5__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1406:1: ( ( ',' ) ) - // InternalTqcl.g:1407:1: ( ',' ) + // InternalTqcl.g:1561:1: ( ( ',' ) ) + // InternalTqcl.g:1562:1: ( ',' ) { - // InternalTqcl.g:1407:1: ( ',' ) - // InternalTqcl.g:1408:2: ',' + // InternalTqcl.g:1562:1: ( ',' ) + // InternalTqcl.g:1563:2: ',' { before(grammarAccess.getConnectAccess().getCommaKeyword_5_0()); match(input,23,FOLLOW_2); @@ -4366,14 +4854,14 @@ public final void rule__Connect__Group_5__0__Impl() throws RecognitionException // $ANTLR start "rule__Connect__Group_5__1" - // InternalTqcl.g:1417:1: rule__Connect__Group_5__1 : rule__Connect__Group_5__1__Impl ; + // InternalTqcl.g:1572:1: rule__Connect__Group_5__1 : rule__Connect__Group_5__1__Impl ; public final void rule__Connect__Group_5__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1421:1: ( rule__Connect__Group_5__1__Impl ) - // InternalTqcl.g:1422:2: rule__Connect__Group_5__1__Impl + // InternalTqcl.g:1576:1: ( rule__Connect__Group_5__1__Impl ) + // InternalTqcl.g:1577:2: rule__Connect__Group_5__1__Impl { pushFollow(FOLLOW_2); rule__Connect__Group_5__1__Impl(); @@ -4399,21 +4887,21 @@ public final void rule__Connect__Group_5__1() throws RecognitionException { // $ANTLR start "rule__Connect__Group_5__1__Impl" - // InternalTqcl.g:1428:1: rule__Connect__Group_5__1__Impl : ( ( rule__Connect__ToAssignment_5_1 ) ) ; + // InternalTqcl.g:1583:1: rule__Connect__Group_5__1__Impl : ( ( rule__Connect__ToAssignment_5_1 ) ) ; public final void rule__Connect__Group_5__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1432:1: ( ( ( rule__Connect__ToAssignment_5_1 ) ) ) - // InternalTqcl.g:1433:1: ( ( rule__Connect__ToAssignment_5_1 ) ) + // InternalTqcl.g:1587:1: ( ( ( rule__Connect__ToAssignment_5_1 ) ) ) + // InternalTqcl.g:1588:1: ( ( rule__Connect__ToAssignment_5_1 ) ) { - // InternalTqcl.g:1433:1: ( ( rule__Connect__ToAssignment_5_1 ) ) - // InternalTqcl.g:1434:2: ( rule__Connect__ToAssignment_5_1 ) + // InternalTqcl.g:1588:1: ( ( rule__Connect__ToAssignment_5_1 ) ) + // InternalTqcl.g:1589:2: ( rule__Connect__ToAssignment_5_1 ) { before(grammarAccess.getConnectAccess().getToAssignment_5_1()); - // InternalTqcl.g:1435:2: ( rule__Connect__ToAssignment_5_1 ) - // InternalTqcl.g:1435:3: rule__Connect__ToAssignment_5_1 + // InternalTqcl.g:1590:2: ( rule__Connect__ToAssignment_5_1 ) + // InternalTqcl.g:1590:3: rule__Connect__ToAssignment_5_1 { pushFollow(FOLLOW_2); rule__Connect__ToAssignment_5_1(); @@ -4445,19 +4933,259 @@ public final void rule__Connect__Group_5__1__Impl() throws RecognitionException // $ANTLR end "rule__Connect__Group_5__1__Impl" - // $ANTLR start "rule__GoInto__Group__0" - // InternalTqcl.g:1444:1: rule__GoInto__Group__0 : rule__GoInto__Group__0__Impl rule__GoInto__Group__1 ; - public final void rule__GoInto__Group__0() throws RecognitionException { + // $ANTLR start "rule__ConnectionPort__Group__0" + // InternalTqcl.g:1599:1: rule__ConnectionPort__Group__0 : rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 ; + public final void rule__ConnectionPort__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1448:1: ( rule__GoInto__Group__0__Impl rule__GoInto__Group__1 ) - // InternalTqcl.g:1449:2: rule__GoInto__Group__0__Impl rule__GoInto__Group__1 + // InternalTqcl.g:1603:1: ( rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 ) + // InternalTqcl.g:1604:2: rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 { - pushFollow(FOLLOW_16); - rule__GoInto__Group__0__Impl(); - + pushFollow(FOLLOW_17); + rule__ConnectionPort__Group__0__Impl(); + + state._fsp--; + + pushFollow(FOLLOW_2); + rule__ConnectionPort__Group__1(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__0" + + + // $ANTLR start "rule__ConnectionPort__Group__0__Impl" + // InternalTqcl.g:1611:1: rule__ConnectionPort__Group__0__Impl : ( ( rule__ConnectionPort__ActorAssignment_0 ) ) ; + public final void rule__ConnectionPort__Group__0__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1615:1: ( ( ( rule__ConnectionPort__ActorAssignment_0 ) ) ) + // InternalTqcl.g:1616:1: ( ( rule__ConnectionPort__ActorAssignment_0 ) ) + { + // InternalTqcl.g:1616:1: ( ( rule__ConnectionPort__ActorAssignment_0 ) ) + // InternalTqcl.g:1617:2: ( rule__ConnectionPort__ActorAssignment_0 ) + { + before(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); + // InternalTqcl.g:1618:2: ( rule__ConnectionPort__ActorAssignment_0 ) + // InternalTqcl.g:1618:3: rule__ConnectionPort__ActorAssignment_0 + { + pushFollow(FOLLOW_2); + rule__ConnectionPort__ActorAssignment_0(); + + state._fsp--; + + + } + + after(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__0__Impl" + + + // $ANTLR start "rule__ConnectionPort__Group__1" + // InternalTqcl.g:1626:1: rule__ConnectionPort__Group__1 : rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 ; + public final void rule__ConnectionPort__Group__1() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1630:1: ( rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 ) + // InternalTqcl.g:1631:2: rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 + { + pushFollow(FOLLOW_18); + rule__ConnectionPort__Group__1__Impl(); + + state._fsp--; + + pushFollow(FOLLOW_2); + rule__ConnectionPort__Group__2(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__1" + + + // $ANTLR start "rule__ConnectionPort__Group__1__Impl" + // InternalTqcl.g:1638:1: rule__ConnectionPort__Group__1__Impl : ( '.' ) ; + public final void rule__ConnectionPort__Group__1__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1642:1: ( ( '.' ) ) + // InternalTqcl.g:1643:1: ( '.' ) + { + // InternalTqcl.g:1643:1: ( '.' ) + // InternalTqcl.g:1644:2: '.' + { + before(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); + match(input,27,FOLLOW_2); + after(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__1__Impl" + + + // $ANTLR start "rule__ConnectionPort__Group__2" + // InternalTqcl.g:1653:1: rule__ConnectionPort__Group__2 : rule__ConnectionPort__Group__2__Impl ; + public final void rule__ConnectionPort__Group__2() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1657:1: ( rule__ConnectionPort__Group__2__Impl ) + // InternalTqcl.g:1658:2: rule__ConnectionPort__Group__2__Impl + { + pushFollow(FOLLOW_2); + rule__ConnectionPort__Group__2__Impl(); + + state._fsp--; + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__2" + + + // $ANTLR start "rule__ConnectionPort__Group__2__Impl" + // InternalTqcl.g:1664:1: rule__ConnectionPort__Group__2__Impl : ( ( rule__ConnectionPort__PortAssignment_2 ) ) ; + public final void rule__ConnectionPort__Group__2__Impl() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1668:1: ( ( ( rule__ConnectionPort__PortAssignment_2 ) ) ) + // InternalTqcl.g:1669:1: ( ( rule__ConnectionPort__PortAssignment_2 ) ) + { + // InternalTqcl.g:1669:1: ( ( rule__ConnectionPort__PortAssignment_2 ) ) + // InternalTqcl.g:1670:2: ( rule__ConnectionPort__PortAssignment_2 ) + { + before(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); + // InternalTqcl.g:1671:2: ( rule__ConnectionPort__PortAssignment_2 ) + // InternalTqcl.g:1671:3: rule__ConnectionPort__PortAssignment_2 + { + pushFollow(FOLLOW_2); + rule__ConnectionPort__PortAssignment_2(); + + state._fsp--; + + + } + + after(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); + + } + + + } + + } + catch (RecognitionException re) { + reportError(re); + recover(input,re); + } + finally { + + restoreStackSize(stackSize); + + } + return ; + } + // $ANTLR end "rule__ConnectionPort__Group__2__Impl" + + + // $ANTLR start "rule__GoInto__Group__0" + // InternalTqcl.g:1680:1: rule__GoInto__Group__0 : rule__GoInto__Group__0__Impl rule__GoInto__Group__1 ; + public final void rule__GoInto__Group__0() throws RecognitionException { + + int stackSize = keepStackSize(); + + try { + // InternalTqcl.g:1684:1: ( rule__GoInto__Group__0__Impl rule__GoInto__Group__1 ) + // InternalTqcl.g:1685:2: rule__GoInto__Group__0__Impl rule__GoInto__Group__1 + { + pushFollow(FOLLOW_19); + rule__GoInto__Group__0__Impl(); + state._fsp--; pushFollow(FOLLOW_2); @@ -4484,20 +5212,20 @@ public final void rule__GoInto__Group__0() throws RecognitionException { // $ANTLR start "rule__GoInto__Group__0__Impl" - // InternalTqcl.g:1456:1: rule__GoInto__Group__0__Impl : ( 'go' ) ; + // InternalTqcl.g:1692:1: rule__GoInto__Group__0__Impl : ( 'go' ) ; public final void rule__GoInto__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1460:1: ( ( 'go' ) ) - // InternalTqcl.g:1461:1: ( 'go' ) + // InternalTqcl.g:1696:1: ( ( 'go' ) ) + // InternalTqcl.g:1697:1: ( 'go' ) { - // InternalTqcl.g:1461:1: ( 'go' ) - // InternalTqcl.g:1462:2: 'go' + // InternalTqcl.g:1697:1: ( 'go' ) + // InternalTqcl.g:1698:2: 'go' { before(grammarAccess.getGoIntoAccess().getGoKeyword_0()); - match(input,27,FOLLOW_2); + match(input,28,FOLLOW_2); after(grammarAccess.getGoIntoAccess().getGoKeyword_0()); } @@ -4521,16 +5249,16 @@ public final void rule__GoInto__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__GoInto__Group__1" - // InternalTqcl.g:1471:1: rule__GoInto__Group__1 : rule__GoInto__Group__1__Impl rule__GoInto__Group__2 ; + // InternalTqcl.g:1707:1: rule__GoInto__Group__1 : rule__GoInto__Group__1__Impl rule__GoInto__Group__2 ; public final void rule__GoInto__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1475:1: ( rule__GoInto__Group__1__Impl rule__GoInto__Group__2 ) - // InternalTqcl.g:1476:2: rule__GoInto__Group__1__Impl rule__GoInto__Group__2 + // InternalTqcl.g:1711:1: ( rule__GoInto__Group__1__Impl rule__GoInto__Group__2 ) + // InternalTqcl.g:1712:2: rule__GoInto__Group__1__Impl rule__GoInto__Group__2 { - pushFollow(FOLLOW_17); + pushFollow(FOLLOW_9); rule__GoInto__Group__1__Impl(); state._fsp--; @@ -4559,21 +5287,21 @@ public final void rule__GoInto__Group__1() throws RecognitionException { // $ANTLR start "rule__GoInto__Group__1__Impl" - // InternalTqcl.g:1483:1: rule__GoInto__Group__1__Impl : ( ( rule__GoInto__DirectionAssignment_1 ) ) ; + // InternalTqcl.g:1719:1: rule__GoInto__Group__1__Impl : ( ( rule__GoInto__DirectionAssignment_1 ) ) ; public final void rule__GoInto__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1487:1: ( ( ( rule__GoInto__DirectionAssignment_1 ) ) ) - // InternalTqcl.g:1488:1: ( ( rule__GoInto__DirectionAssignment_1 ) ) + // InternalTqcl.g:1723:1: ( ( ( rule__GoInto__DirectionAssignment_1 ) ) ) + // InternalTqcl.g:1724:1: ( ( rule__GoInto__DirectionAssignment_1 ) ) { - // InternalTqcl.g:1488:1: ( ( rule__GoInto__DirectionAssignment_1 ) ) - // InternalTqcl.g:1489:2: ( rule__GoInto__DirectionAssignment_1 ) + // InternalTqcl.g:1724:1: ( ( rule__GoInto__DirectionAssignment_1 ) ) + // InternalTqcl.g:1725:2: ( rule__GoInto__DirectionAssignment_1 ) { before(grammarAccess.getGoIntoAccess().getDirectionAssignment_1()); - // InternalTqcl.g:1490:2: ( rule__GoInto__DirectionAssignment_1 ) - // InternalTqcl.g:1490:3: rule__GoInto__DirectionAssignment_1 + // InternalTqcl.g:1726:2: ( rule__GoInto__DirectionAssignment_1 ) + // InternalTqcl.g:1726:3: rule__GoInto__DirectionAssignment_1 { pushFollow(FOLLOW_2); rule__GoInto__DirectionAssignment_1(); @@ -4606,14 +5334,14 @@ public final void rule__GoInto__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__GoInto__Group__2" - // InternalTqcl.g:1498:1: rule__GoInto__Group__2 : rule__GoInto__Group__2__Impl ; + // InternalTqcl.g:1734:1: rule__GoInto__Group__2 : rule__GoInto__Group__2__Impl ; public final void rule__GoInto__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1502:1: ( rule__GoInto__Group__2__Impl ) - // InternalTqcl.g:1503:2: rule__GoInto__Group__2__Impl + // InternalTqcl.g:1738:1: ( rule__GoInto__Group__2__Impl ) + // InternalTqcl.g:1739:2: rule__GoInto__Group__2__Impl { pushFollow(FOLLOW_2); rule__GoInto__Group__2__Impl(); @@ -4639,31 +5367,31 @@ public final void rule__GoInto__Group__2() throws RecognitionException { // $ANTLR start "rule__GoInto__Group__2__Impl" - // InternalTqcl.g:1509:1: rule__GoInto__Group__2__Impl : ( ( rule__GoInto__ObjAssignment_2 ) ) ; + // InternalTqcl.g:1745:1: rule__GoInto__Group__2__Impl : ( ( rule__GoInto__ActorAssignment_2 ) ) ; public final void rule__GoInto__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1513:1: ( ( ( rule__GoInto__ObjAssignment_2 ) ) ) - // InternalTqcl.g:1514:1: ( ( rule__GoInto__ObjAssignment_2 ) ) + // InternalTqcl.g:1749:1: ( ( ( rule__GoInto__ActorAssignment_2 ) ) ) + // InternalTqcl.g:1750:1: ( ( rule__GoInto__ActorAssignment_2 ) ) { - // InternalTqcl.g:1514:1: ( ( rule__GoInto__ObjAssignment_2 ) ) - // InternalTqcl.g:1515:2: ( rule__GoInto__ObjAssignment_2 ) + // InternalTqcl.g:1750:1: ( ( rule__GoInto__ActorAssignment_2 ) ) + // InternalTqcl.g:1751:2: ( rule__GoInto__ActorAssignment_2 ) { - before(grammarAccess.getGoIntoAccess().getObjAssignment_2()); - // InternalTqcl.g:1516:2: ( rule__GoInto__ObjAssignment_2 ) - // InternalTqcl.g:1516:3: rule__GoInto__ObjAssignment_2 + before(grammarAccess.getGoIntoAccess().getActorAssignment_2()); + // InternalTqcl.g:1752:2: ( rule__GoInto__ActorAssignment_2 ) + // InternalTqcl.g:1752:3: rule__GoInto__ActorAssignment_2 { pushFollow(FOLLOW_2); - rule__GoInto__ObjAssignment_2(); + rule__GoInto__ActorAssignment_2(); state._fsp--; } - after(grammarAccess.getGoIntoAccess().getObjAssignment_2()); + after(grammarAccess.getGoIntoAccess().getActorAssignment_2()); } @@ -4686,16 +5414,16 @@ public final void rule__GoInto__Group__2__Impl() throws RecognitionException { // $ANTLR start "rule__GoOut__Group__0" - // InternalTqcl.g:1525:1: rule__GoOut__Group__0 : rule__GoOut__Group__0__Impl rule__GoOut__Group__1 ; + // InternalTqcl.g:1761:1: rule__GoOut__Group__0 : rule__GoOut__Group__0__Impl rule__GoOut__Group__1 ; public final void rule__GoOut__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1529:1: ( rule__GoOut__Group__0__Impl rule__GoOut__Group__1 ) - // InternalTqcl.g:1530:2: rule__GoOut__Group__0__Impl rule__GoOut__Group__1 + // InternalTqcl.g:1765:1: ( rule__GoOut__Group__0__Impl rule__GoOut__Group__1 ) + // InternalTqcl.g:1766:2: rule__GoOut__Group__0__Impl rule__GoOut__Group__1 { - pushFollow(FOLLOW_18); + pushFollow(FOLLOW_20); rule__GoOut__Group__0__Impl(); state._fsp--; @@ -4724,20 +5452,20 @@ public final void rule__GoOut__Group__0() throws RecognitionException { // $ANTLR start "rule__GoOut__Group__0__Impl" - // InternalTqcl.g:1537:1: rule__GoOut__Group__0__Impl : ( 'go' ) ; + // InternalTqcl.g:1773:1: rule__GoOut__Group__0__Impl : ( 'go' ) ; public final void rule__GoOut__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1541:1: ( ( 'go' ) ) - // InternalTqcl.g:1542:1: ( 'go' ) + // InternalTqcl.g:1777:1: ( ( 'go' ) ) + // InternalTqcl.g:1778:1: ( 'go' ) { - // InternalTqcl.g:1542:1: ( 'go' ) - // InternalTqcl.g:1543:2: 'go' + // InternalTqcl.g:1778:1: ( 'go' ) + // InternalTqcl.g:1779:2: 'go' { before(grammarAccess.getGoOutAccess().getGoKeyword_0()); - match(input,27,FOLLOW_2); + match(input,28,FOLLOW_2); after(grammarAccess.getGoOutAccess().getGoKeyword_0()); } @@ -4761,14 +5489,14 @@ public final void rule__GoOut__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__GoOut__Group__1" - // InternalTqcl.g:1552:1: rule__GoOut__Group__1 : rule__GoOut__Group__1__Impl ; + // InternalTqcl.g:1788:1: rule__GoOut__Group__1 : rule__GoOut__Group__1__Impl ; public final void rule__GoOut__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1556:1: ( rule__GoOut__Group__1__Impl ) - // InternalTqcl.g:1557:2: rule__GoOut__Group__1__Impl + // InternalTqcl.g:1792:1: ( rule__GoOut__Group__1__Impl ) + // InternalTqcl.g:1793:2: rule__GoOut__Group__1__Impl { pushFollow(FOLLOW_2); rule__GoOut__Group__1__Impl(); @@ -4794,21 +5522,21 @@ public final void rule__GoOut__Group__1() throws RecognitionException { // $ANTLR start "rule__GoOut__Group__1__Impl" - // InternalTqcl.g:1563:1: rule__GoOut__Group__1__Impl : ( ( rule__GoOut__DirectionAssignment_1 ) ) ; + // InternalTqcl.g:1799:1: rule__GoOut__Group__1__Impl : ( ( rule__GoOut__DirectionAssignment_1 ) ) ; public final void rule__GoOut__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1567:1: ( ( ( rule__GoOut__DirectionAssignment_1 ) ) ) - // InternalTqcl.g:1568:1: ( ( rule__GoOut__DirectionAssignment_1 ) ) + // InternalTqcl.g:1803:1: ( ( ( rule__GoOut__DirectionAssignment_1 ) ) ) + // InternalTqcl.g:1804:1: ( ( rule__GoOut__DirectionAssignment_1 ) ) { - // InternalTqcl.g:1568:1: ( ( rule__GoOut__DirectionAssignment_1 ) ) - // InternalTqcl.g:1569:2: ( rule__GoOut__DirectionAssignment_1 ) + // InternalTqcl.g:1804:1: ( ( rule__GoOut__DirectionAssignment_1 ) ) + // InternalTqcl.g:1805:2: ( rule__GoOut__DirectionAssignment_1 ) { before(grammarAccess.getGoOutAccess().getDirectionAssignment_1()); - // InternalTqcl.g:1570:2: ( rule__GoOut__DirectionAssignment_1 ) - // InternalTqcl.g:1570:3: rule__GoOut__DirectionAssignment_1 + // InternalTqcl.g:1806:2: ( rule__GoOut__DirectionAssignment_1 ) + // InternalTqcl.g:1806:3: rule__GoOut__DirectionAssignment_1 { pushFollow(FOLLOW_2); rule__GoOut__DirectionAssignment_1(); @@ -4841,16 +5569,16 @@ public final void rule__GoOut__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__GoTop__Group__0" - // InternalTqcl.g:1579:1: rule__GoTop__Group__0 : rule__GoTop__Group__0__Impl rule__GoTop__Group__1 ; + // InternalTqcl.g:1815:1: rule__GoTop__Group__0 : rule__GoTop__Group__0__Impl rule__GoTop__Group__1 ; public final void rule__GoTop__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1583:1: ( rule__GoTop__Group__0__Impl rule__GoTop__Group__1 ) - // InternalTqcl.g:1584:2: rule__GoTop__Group__0__Impl rule__GoTop__Group__1 + // InternalTqcl.g:1819:1: ( rule__GoTop__Group__0__Impl rule__GoTop__Group__1 ) + // InternalTqcl.g:1820:2: rule__GoTop__Group__0__Impl rule__GoTop__Group__1 { - pushFollow(FOLLOW_19); + pushFollow(FOLLOW_21); rule__GoTop__Group__0__Impl(); state._fsp--; @@ -4879,20 +5607,20 @@ public final void rule__GoTop__Group__0() throws RecognitionException { // $ANTLR start "rule__GoTop__Group__0__Impl" - // InternalTqcl.g:1591:1: rule__GoTop__Group__0__Impl : ( 'go' ) ; + // InternalTqcl.g:1827:1: rule__GoTop__Group__0__Impl : ( 'go' ) ; public final void rule__GoTop__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1595:1: ( ( 'go' ) ) - // InternalTqcl.g:1596:1: ( 'go' ) + // InternalTqcl.g:1831:1: ( ( 'go' ) ) + // InternalTqcl.g:1832:1: ( 'go' ) { - // InternalTqcl.g:1596:1: ( 'go' ) - // InternalTqcl.g:1597:2: 'go' + // InternalTqcl.g:1832:1: ( 'go' ) + // InternalTqcl.g:1833:2: 'go' { before(grammarAccess.getGoTopAccess().getGoKeyword_0()); - match(input,27,FOLLOW_2); + match(input,28,FOLLOW_2); after(grammarAccess.getGoTopAccess().getGoKeyword_0()); } @@ -4916,14 +5644,14 @@ public final void rule__GoTop__Group__0__Impl() throws RecognitionException { // $ANTLR start "rule__GoTop__Group__1" - // InternalTqcl.g:1606:1: rule__GoTop__Group__1 : rule__GoTop__Group__1__Impl ; + // InternalTqcl.g:1842:1: rule__GoTop__Group__1 : rule__GoTop__Group__1__Impl ; public final void rule__GoTop__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1610:1: ( rule__GoTop__Group__1__Impl ) - // InternalTqcl.g:1611:2: rule__GoTop__Group__1__Impl + // InternalTqcl.g:1846:1: ( rule__GoTop__Group__1__Impl ) + // InternalTqcl.g:1847:2: rule__GoTop__Group__1__Impl { pushFollow(FOLLOW_2); rule__GoTop__Group__1__Impl(); @@ -4949,21 +5677,21 @@ public final void rule__GoTop__Group__1() throws RecognitionException { // $ANTLR start "rule__GoTop__Group__1__Impl" - // InternalTqcl.g:1617:1: rule__GoTop__Group__1__Impl : ( ( rule__GoTop__DirectionAssignment_1 ) ) ; + // InternalTqcl.g:1853:1: rule__GoTop__Group__1__Impl : ( ( rule__GoTop__DirectionAssignment_1 ) ) ; public final void rule__GoTop__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1621:1: ( ( ( rule__GoTop__DirectionAssignment_1 ) ) ) - // InternalTqcl.g:1622:1: ( ( rule__GoTop__DirectionAssignment_1 ) ) + // InternalTqcl.g:1857:1: ( ( ( rule__GoTop__DirectionAssignment_1 ) ) ) + // InternalTqcl.g:1858:1: ( ( rule__GoTop__DirectionAssignment_1 ) ) { - // InternalTqcl.g:1622:1: ( ( rule__GoTop__DirectionAssignment_1 ) ) - // InternalTqcl.g:1623:2: ( rule__GoTop__DirectionAssignment_1 ) + // InternalTqcl.g:1858:1: ( ( rule__GoTop__DirectionAssignment_1 ) ) + // InternalTqcl.g:1859:2: ( rule__GoTop__DirectionAssignment_1 ) { before(grammarAccess.getGoTopAccess().getDirectionAssignment_1()); - // InternalTqcl.g:1624:2: ( rule__GoTop__DirectionAssignment_1 ) - // InternalTqcl.g:1624:3: rule__GoTop__DirectionAssignment_1 + // InternalTqcl.g:1860:2: ( rule__GoTop__DirectionAssignment_1 ) + // InternalTqcl.g:1860:3: rule__GoTop__DirectionAssignment_1 { pushFollow(FOLLOW_2); rule__GoTop__DirectionAssignment_1(); @@ -4996,16 +5724,16 @@ public final void rule__GoTop__Group__1__Impl() throws RecognitionException { // $ANTLR start "rule__Parameter__Group__0" - // InternalTqcl.g:1633:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ; + // InternalTqcl.g:1869:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ; public final void rule__Parameter__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1637:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ) - // InternalTqcl.g:1638:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1 + // InternalTqcl.g:1873:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ) + // InternalTqcl.g:1874:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1 { - pushFollow(FOLLOW_20); + pushFollow(FOLLOW_22); rule__Parameter__Group__0__Impl(); state._fsp--; @@ -5034,21 +5762,21 @@ public final void rule__Parameter__Group__0() throws RecognitionException { // $ANTLR start "rule__Parameter__Group__0__Impl" - // InternalTqcl.g:1645:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__IdAssignment_0 ) ) ; + // InternalTqcl.g:1881:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__IdAssignment_0 ) ) ; public final void rule__Parameter__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1649:1: ( ( ( rule__Parameter__IdAssignment_0 ) ) ) - // InternalTqcl.g:1650:1: ( ( rule__Parameter__IdAssignment_0 ) ) + // InternalTqcl.g:1885:1: ( ( ( rule__Parameter__IdAssignment_0 ) ) ) + // InternalTqcl.g:1886:1: ( ( rule__Parameter__IdAssignment_0 ) ) { - // InternalTqcl.g:1650:1: ( ( rule__Parameter__IdAssignment_0 ) ) - // InternalTqcl.g:1651:2: ( rule__Parameter__IdAssignment_0 ) + // InternalTqcl.g:1886:1: ( ( rule__Parameter__IdAssignment_0 ) ) + // InternalTqcl.g:1887:2: ( rule__Parameter__IdAssignment_0 ) { before(grammarAccess.getParameterAccess().getIdAssignment_0()); - // InternalTqcl.g:1652:2: ( rule__Parameter__IdAssignment_0 ) - // InternalTqcl.g:1652:3: rule__Parameter__IdAssignment_0 + // InternalTqcl.g:1888:2: ( rule__Parameter__IdAssignment_0 ) + // InternalTqcl.g:1888:3: rule__Parameter__IdAssignment_0 { pushFollow(FOLLOW_2); rule__Parameter__IdAssignment_0(); @@ -5060,115 +5788,7 @@ public final void rule__Parameter__Group__0__Impl() throws RecognitionException after(grammarAccess.getParameterAccess().getIdAssignment_0()); - } - - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__Parameter__Group__0__Impl" - - - // $ANTLR start "rule__Parameter__Group__1" - // InternalTqcl.g:1660:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl rule__Parameter__Group__2 ; - public final void rule__Parameter__Group__1() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // InternalTqcl.g:1664:1: ( rule__Parameter__Group__1__Impl rule__Parameter__Group__2 ) - // InternalTqcl.g:1665:2: rule__Parameter__Group__1__Impl rule__Parameter__Group__2 - { - pushFollow(FOLLOW_7); - rule__Parameter__Group__1__Impl(); - - state._fsp--; - - pushFollow(FOLLOW_2); - rule__Parameter__Group__2(); - - state._fsp--; - - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__Parameter__Group__1" - - - // $ANTLR start "rule__Parameter__Group__1__Impl" - // InternalTqcl.g:1672:1: rule__Parameter__Group__1__Impl : ( '=' ) ; - public final void rule__Parameter__Group__1__Impl() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // InternalTqcl.g:1676:1: ( ( '=' ) ) - // InternalTqcl.g:1677:1: ( '=' ) - { - // InternalTqcl.g:1677:1: ( '=' ) - // InternalTqcl.g:1678:2: '=' - { - before(grammarAccess.getParameterAccess().getEqualsSignKeyword_1()); - match(input,28,FOLLOW_2); - after(grammarAccess.getParameterAccess().getEqualsSignKeyword_1()); - - } - - - } - - } - catch (RecognitionException re) { - reportError(re); - recover(input,re); - } - finally { - - restoreStackSize(stackSize); - - } - return ; - } - // $ANTLR end "rule__Parameter__Group__1__Impl" - - - // $ANTLR start "rule__Parameter__Group__2" - // InternalTqcl.g:1687:1: rule__Parameter__Group__2 : rule__Parameter__Group__2__Impl ; - public final void rule__Parameter__Group__2() throws RecognitionException { - - int stackSize = keepStackSize(); - - try { - // InternalTqcl.g:1691:1: ( rule__Parameter__Group__2__Impl ) - // InternalTqcl.g:1692:2: rule__Parameter__Group__2__Impl - { - pushFollow(FOLLOW_2); - rule__Parameter__Group__2__Impl(); - - state._fsp--; + } } @@ -5185,37 +5805,28 @@ public final void rule__Parameter__Group__2() throws RecognitionException { } return ; } - // $ANTLR end "rule__Parameter__Group__2" + // $ANTLR end "rule__Parameter__Group__0__Impl" - // $ANTLR start "rule__Parameter__Group__2__Impl" - // InternalTqcl.g:1698:1: rule__Parameter__Group__2__Impl : ( ( rule__Parameter__ValueAssignment_2 ) ) ; - public final void rule__Parameter__Group__2__Impl() throws RecognitionException { + // $ANTLR start "rule__Parameter__Group__1" + // InternalTqcl.g:1896:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl rule__Parameter__Group__2 ; + public final void rule__Parameter__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1702:1: ( ( ( rule__Parameter__ValueAssignment_2 ) ) ) - // InternalTqcl.g:1703:1: ( ( rule__Parameter__ValueAssignment_2 ) ) - { - // InternalTqcl.g:1703:1: ( ( rule__Parameter__ValueAssignment_2 ) ) - // InternalTqcl.g:1704:2: ( rule__Parameter__ValueAssignment_2 ) + // InternalTqcl.g:1900:1: ( rule__Parameter__Group__1__Impl rule__Parameter__Group__2 ) + // InternalTqcl.g:1901:2: rule__Parameter__Group__1__Impl rule__Parameter__Group__2 { - before(grammarAccess.getParameterAccess().getValueAssignment_2()); - // InternalTqcl.g:1705:2: ( rule__Parameter__ValueAssignment_2 ) - // InternalTqcl.g:1705:3: rule__Parameter__ValueAssignment_2 - { - pushFollow(FOLLOW_2); - rule__Parameter__ValueAssignment_2(); + pushFollow(FOLLOW_8); + rule__Parameter__Group__1__Impl(); state._fsp--; + pushFollow(FOLLOW_2); + rule__Parameter__Group__2(); - } - - after(grammarAccess.getParameterAccess().getValueAssignment_2()); - - } + state._fsp--; } @@ -5232,28 +5843,27 @@ public final void rule__Parameter__Group__2__Impl() throws RecognitionException } return ; } - // $ANTLR end "rule__Parameter__Group__2__Impl" + // $ANTLR end "rule__Parameter__Group__1" - // $ANTLR start "rule__ConnectionPort__Group__0" - // InternalTqcl.g:1714:1: rule__ConnectionPort__Group__0 : rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 ; - public final void rule__ConnectionPort__Group__0() throws RecognitionException { + // $ANTLR start "rule__Parameter__Group__1__Impl" + // InternalTqcl.g:1908:1: rule__Parameter__Group__1__Impl : ( '=' ) ; + public final void rule__Parameter__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1718:1: ( rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 ) - // InternalTqcl.g:1719:2: rule__ConnectionPort__Group__0__Impl rule__ConnectionPort__Group__1 + // InternalTqcl.g:1912:1: ( ( '=' ) ) + // InternalTqcl.g:1913:1: ( '=' ) { - pushFollow(FOLLOW_21); - rule__ConnectionPort__Group__0__Impl(); - - state._fsp--; - - pushFollow(FOLLOW_2); - rule__ConnectionPort__Group__1(); + // InternalTqcl.g:1913:1: ( '=' ) + // InternalTqcl.g:1914:2: '=' + { + before(grammarAccess.getParameterAccess().getEqualsSignKeyword_1()); + match(input,29,FOLLOW_2); + after(grammarAccess.getParameterAccess().getEqualsSignKeyword_1()); - state._fsp--; + } } @@ -5270,39 +5880,25 @@ public final void rule__ConnectionPort__Group__0() throws RecognitionException { } return ; } - // $ANTLR end "rule__ConnectionPort__Group__0" + // $ANTLR end "rule__Parameter__Group__1__Impl" - // $ANTLR start "rule__ConnectionPort__Group__0__Impl" - // InternalTqcl.g:1726:1: rule__ConnectionPort__Group__0__Impl : ( ( rule__ConnectionPort__ActorAssignment_0 ) ) ; - public final void rule__ConnectionPort__Group__0__Impl() throws RecognitionException { + // $ANTLR start "rule__Parameter__Group__2" + // InternalTqcl.g:1923:1: rule__Parameter__Group__2 : rule__Parameter__Group__2__Impl ; + public final void rule__Parameter__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1730:1: ( ( ( rule__ConnectionPort__ActorAssignment_0 ) ) ) - // InternalTqcl.g:1731:1: ( ( rule__ConnectionPort__ActorAssignment_0 ) ) - { - // InternalTqcl.g:1731:1: ( ( rule__ConnectionPort__ActorAssignment_0 ) ) - // InternalTqcl.g:1732:2: ( rule__ConnectionPort__ActorAssignment_0 ) - { - before(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); - // InternalTqcl.g:1733:2: ( rule__ConnectionPort__ActorAssignment_0 ) - // InternalTqcl.g:1733:3: rule__ConnectionPort__ActorAssignment_0 + // InternalTqcl.g:1927:1: ( rule__Parameter__Group__2__Impl ) + // InternalTqcl.g:1928:2: rule__Parameter__Group__2__Impl { pushFollow(FOLLOW_2); - rule__ConnectionPort__ActorAssignment_0(); + rule__Parameter__Group__2__Impl(); state._fsp--; - } - - after(grammarAccess.getConnectionPortAccess().getActorAssignment_0()); - - } - - } } @@ -5317,28 +5913,37 @@ public final void rule__ConnectionPort__Group__0__Impl() throws RecognitionExcep } return ; } - // $ANTLR end "rule__ConnectionPort__Group__0__Impl" + // $ANTLR end "rule__Parameter__Group__2" - // $ANTLR start "rule__ConnectionPort__Group__1" - // InternalTqcl.g:1741:1: rule__ConnectionPort__Group__1 : rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 ; - public final void rule__ConnectionPort__Group__1() throws RecognitionException { + // $ANTLR start "rule__Parameter__Group__2__Impl" + // InternalTqcl.g:1934:1: rule__Parameter__Group__2__Impl : ( ( rule__Parameter__ValueAssignment_2 ) ) ; + public final void rule__Parameter__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1745:1: ( rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 ) - // InternalTqcl.g:1746:2: rule__ConnectionPort__Group__1__Impl rule__ConnectionPort__Group__2 + // InternalTqcl.g:1938:1: ( ( ( rule__Parameter__ValueAssignment_2 ) ) ) + // InternalTqcl.g:1939:1: ( ( rule__Parameter__ValueAssignment_2 ) ) { - pushFollow(FOLLOW_17); - rule__ConnectionPort__Group__1__Impl(); + // InternalTqcl.g:1939:1: ( ( rule__Parameter__ValueAssignment_2 ) ) + // InternalTqcl.g:1940:2: ( rule__Parameter__ValueAssignment_2 ) + { + before(grammarAccess.getParameterAccess().getValueAssignment_2()); + // InternalTqcl.g:1941:2: ( rule__Parameter__ValueAssignment_2 ) + // InternalTqcl.g:1941:3: rule__Parameter__ValueAssignment_2 + { + pushFollow(FOLLOW_2); + rule__Parameter__ValueAssignment_2(); state._fsp--; - pushFollow(FOLLOW_2); - rule__ConnectionPort__Group__2(); - state._fsp--; + } + + after(grammarAccess.getParameterAccess().getValueAssignment_2()); + + } } @@ -5355,25 +5960,29 @@ public final void rule__ConnectionPort__Group__1() throws RecognitionException { } return ; } - // $ANTLR end "rule__ConnectionPort__Group__1" + // $ANTLR end "rule__Parameter__Group__2__Impl" - // $ANTLR start "rule__ConnectionPort__Group__1__Impl" - // InternalTqcl.g:1753:1: rule__ConnectionPort__Group__1__Impl : ( '.' ) ; - public final void rule__ConnectionPort__Group__1__Impl() throws RecognitionException { + // $ANTLR start "rule__TriquetrumScript__LibrariesAssignment_0" + // InternalTqcl.g:1950:1: rule__TriquetrumScript__LibrariesAssignment_0 : ( ruleLibrary ) ; + public final void rule__TriquetrumScript__LibrariesAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1757:1: ( ( '.' ) ) - // InternalTqcl.g:1758:1: ( '.' ) + // InternalTqcl.g:1954:1: ( ( ruleLibrary ) ) + // InternalTqcl.g:1955:2: ( ruleLibrary ) { - // InternalTqcl.g:1758:1: ( '.' ) - // InternalTqcl.g:1759:2: '.' + // InternalTqcl.g:1955:2: ( ruleLibrary ) + // InternalTqcl.g:1956:3: ruleLibrary { - before(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); - match(input,29,FOLLOW_2); - after(grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); + before(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); + pushFollow(FOLLOW_2); + ruleLibrary(); + + state._fsp--; + + after(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); } @@ -5392,24 +6001,32 @@ public final void rule__ConnectionPort__Group__1__Impl() throws RecognitionExcep } return ; } - // $ANTLR end "rule__ConnectionPort__Group__1__Impl" + // $ANTLR end "rule__TriquetrumScript__LibrariesAssignment_0" - // $ANTLR start "rule__ConnectionPort__Group__2" - // InternalTqcl.g:1768:1: rule__ConnectionPort__Group__2 : rule__ConnectionPort__Group__2__Impl ; - public final void rule__ConnectionPort__Group__2() throws RecognitionException { + // $ANTLR start "rule__TriquetrumScript__CommandsAssignment_1" + // InternalTqcl.g:1965:1: rule__TriquetrumScript__CommandsAssignment_1 : ( ruleCommand ) ; + public final void rule__TriquetrumScript__CommandsAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1772:1: ( rule__ConnectionPort__Group__2__Impl ) - // InternalTqcl.g:1773:2: rule__ConnectionPort__Group__2__Impl + // InternalTqcl.g:1969:1: ( ( ruleCommand ) ) + // InternalTqcl.g:1970:2: ( ruleCommand ) { + // InternalTqcl.g:1970:2: ( ruleCommand ) + // InternalTqcl.g:1971:3: ruleCommand + { + before(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); pushFollow(FOLLOW_2); - rule__ConnectionPort__Group__2__Impl(); + ruleCommand(); state._fsp--; + after(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); + + } + } @@ -5425,35 +6042,29 @@ public final void rule__ConnectionPort__Group__2() throws RecognitionException { } return ; } - // $ANTLR end "rule__ConnectionPort__Group__2" + // $ANTLR end "rule__TriquetrumScript__CommandsAssignment_1" - // $ANTLR start "rule__ConnectionPort__Group__2__Impl" - // InternalTqcl.g:1779:1: rule__ConnectionPort__Group__2__Impl : ( ( rule__ConnectionPort__PortAssignment_2 ) ) ; - public final void rule__ConnectionPort__Group__2__Impl() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__StartAssignment_0" + // InternalTqcl.g:1980:1: rule__CompositeCommand__StartAssignment_0 : ( ruleGoInto ) ; + public final void rule__CompositeCommand__StartAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1783:1: ( ( ( rule__ConnectionPort__PortAssignment_2 ) ) ) - // InternalTqcl.g:1784:1: ( ( rule__ConnectionPort__PortAssignment_2 ) ) + // InternalTqcl.g:1984:1: ( ( ruleGoInto ) ) + // InternalTqcl.g:1985:2: ( ruleGoInto ) { - // InternalTqcl.g:1784:1: ( ( rule__ConnectionPort__PortAssignment_2 ) ) - // InternalTqcl.g:1785:2: ( rule__ConnectionPort__PortAssignment_2 ) - { - before(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); - // InternalTqcl.g:1786:2: ( rule__ConnectionPort__PortAssignment_2 ) - // InternalTqcl.g:1786:3: rule__ConnectionPort__PortAssignment_2 + // InternalTqcl.g:1985:2: ( ruleGoInto ) + // InternalTqcl.g:1986:3: ruleGoInto { + before(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); pushFollow(FOLLOW_2); - rule__ConnectionPort__PortAssignment_2(); + ruleGoInto(); state._fsp--; - - } - - after(grammarAccess.getConnectionPortAccess().getPortAssignment_2()); + after(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); } @@ -5472,29 +6083,29 @@ public final void rule__ConnectionPort__Group__2__Impl() throws RecognitionExcep } return ; } - // $ANTLR end "rule__ConnectionPort__Group__2__Impl" + // $ANTLR end "rule__CompositeCommand__StartAssignment_0" - // $ANTLR start "rule__TriquetrumScript__LibrariesAssignment_0" - // InternalTqcl.g:1795:1: rule__TriquetrumScript__LibrariesAssignment_0 : ( ruleLibrary ) ; - public final void rule__TriquetrumScript__LibrariesAssignment_0() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__CommandsAssignment_1" + // InternalTqcl.g:1995:1: rule__CompositeCommand__CommandsAssignment_1 : ( ruleCommand ) ; + public final void rule__CompositeCommand__CommandsAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1799:1: ( ( ruleLibrary ) ) - // InternalTqcl.g:1800:2: ( ruleLibrary ) + // InternalTqcl.g:1999:1: ( ( ruleCommand ) ) + // InternalTqcl.g:2000:2: ( ruleCommand ) { - // InternalTqcl.g:1800:2: ( ruleLibrary ) - // InternalTqcl.g:1801:3: ruleLibrary + // InternalTqcl.g:2000:2: ( ruleCommand ) + // InternalTqcl.g:2001:3: ruleCommand { - before(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); + before(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); pushFollow(FOLLOW_2); - ruleLibrary(); + ruleCommand(); state._fsp--; - after(grammarAccess.getTriquetrumScriptAccess().getLibrariesLibraryParserRuleCall_0_0()); + after(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); } @@ -5513,29 +6124,35 @@ public final void rule__TriquetrumScript__LibrariesAssignment_0() throws Recogni } return ; } - // $ANTLR end "rule__TriquetrumScript__LibrariesAssignment_0" + // $ANTLR end "rule__CompositeCommand__CommandsAssignment_1" - // $ANTLR start "rule__TriquetrumScript__CommandsAssignment_1" - // InternalTqcl.g:1810:1: rule__TriquetrumScript__CommandsAssignment_1 : ( ruleCommand ) ; - public final void rule__TriquetrumScript__CommandsAssignment_1() throws RecognitionException { + // $ANTLR start "rule__CompositeCommand__EndAssignment_2" + // InternalTqcl.g:2010:1: rule__CompositeCommand__EndAssignment_2 : ( ( rule__CompositeCommand__EndAlternatives_2_0 ) ) ; + public final void rule__CompositeCommand__EndAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1814:1: ( ( ruleCommand ) ) - // InternalTqcl.g:1815:2: ( ruleCommand ) + // InternalTqcl.g:2014:1: ( ( ( rule__CompositeCommand__EndAlternatives_2_0 ) ) ) + // InternalTqcl.g:2015:2: ( ( rule__CompositeCommand__EndAlternatives_2_0 ) ) { - // InternalTqcl.g:1815:2: ( ruleCommand ) - // InternalTqcl.g:1816:3: ruleCommand + // InternalTqcl.g:2015:2: ( ( rule__CompositeCommand__EndAlternatives_2_0 ) ) + // InternalTqcl.g:2016:3: ( rule__CompositeCommand__EndAlternatives_2_0 ) + { + before(grammarAccess.getCompositeCommandAccess().getEndAlternatives_2_0()); + // InternalTqcl.g:2017:3: ( rule__CompositeCommand__EndAlternatives_2_0 ) + // InternalTqcl.g:2017:4: rule__CompositeCommand__EndAlternatives_2_0 { - before(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); pushFollow(FOLLOW_2); - ruleCommand(); + rule__CompositeCommand__EndAlternatives_2_0(); state._fsp--; - after(grammarAccess.getTriquetrumScriptAccess().getCommandsCommandParserRuleCall_1_0()); + + } + + after(grammarAccess.getCompositeCommandAccess().getEndAlternatives_2_0()); } @@ -5554,21 +6171,21 @@ public final void rule__TriquetrumScript__CommandsAssignment_1() throws Recognit } return ; } - // $ANTLR end "rule__TriquetrumScript__CommandsAssignment_1" + // $ANTLR end "rule__CompositeCommand__EndAssignment_2" // $ANTLR start "rule__Include__FilenameAssignment_1" - // InternalTqcl.g:1825:1: rule__Include__FilenameAssignment_1 : ( RULE_STRING ) ; + // InternalTqcl.g:2025:1: rule__Include__FilenameAssignment_1 : ( RULE_STRING ) ; public final void rule__Include__FilenameAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1829:1: ( ( RULE_STRING ) ) - // InternalTqcl.g:1830:2: ( RULE_STRING ) + // InternalTqcl.g:2029:1: ( ( RULE_STRING ) ) + // InternalTqcl.g:2030:2: ( RULE_STRING ) { - // InternalTqcl.g:1830:2: ( RULE_STRING ) - // InternalTqcl.g:1831:3: RULE_STRING + // InternalTqcl.g:2030:2: ( RULE_STRING ) + // InternalTqcl.g:2031:3: RULE_STRING { before(grammarAccess.getIncludeAccess().getFilenameSTRINGTerminalRuleCall_1_0()); match(input,RULE_STRING,FOLLOW_2); @@ -5595,17 +6212,17 @@ public final void rule__Include__FilenameAssignment_1() throws RecognitionExcept // $ANTLR start "rule__Library__NameAssignment_1" - // InternalTqcl.g:1840:1: rule__Library__NameAssignment_1 : ( RULE_ID ) ; + // InternalTqcl.g:2040:1: rule__Library__NameAssignment_1 : ( RULE_ID ) ; public final void rule__Library__NameAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1844:1: ( ( RULE_ID ) ) - // InternalTqcl.g:1845:2: ( RULE_ID ) + // InternalTqcl.g:2044:1: ( ( RULE_ID ) ) + // InternalTqcl.g:2045:2: ( RULE_ID ) { - // InternalTqcl.g:1845:2: ( RULE_ID ) - // InternalTqcl.g:1846:3: RULE_ID + // InternalTqcl.g:2045:2: ( RULE_ID ) + // InternalTqcl.g:2046:3: RULE_ID { before(grammarAccess.getLibraryAccess().getNameIDTerminalRuleCall_1_0()); match(input,RULE_ID,FOLLOW_2); @@ -5632,17 +6249,17 @@ public final void rule__Library__NameAssignment_1() throws RecognitionException // $ANTLR start "rule__Insert__CategoryAssignment_1" - // InternalTqcl.g:1855:1: rule__Insert__CategoryAssignment_1 : ( ruleCategory ) ; + // InternalTqcl.g:2055:1: rule__Insert__CategoryAssignment_1 : ( ruleCategory ) ; public final void rule__Insert__CategoryAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1859:1: ( ( ruleCategory ) ) - // InternalTqcl.g:1860:2: ( ruleCategory ) + // InternalTqcl.g:2059:1: ( ( ruleCategory ) ) + // InternalTqcl.g:2060:2: ( ruleCategory ) { - // InternalTqcl.g:1860:2: ( ruleCategory ) - // InternalTqcl.g:1861:3: ruleCategory + // InternalTqcl.g:2060:2: ( ruleCategory ) + // InternalTqcl.g:2061:3: ruleCategory { before(grammarAccess.getInsertAccess().getCategoryCategoryEnumRuleCall_1_0()); pushFollow(FOLLOW_2); @@ -5673,17 +6290,17 @@ public final void rule__Insert__CategoryAssignment_1() throws RecognitionExcepti // $ANTLR start "rule__Insert__EntityClassAssignment_2" - // InternalTqcl.g:1870:1: rule__Insert__EntityClassAssignment_2 : ( RULE_ENTITY_CLASS ) ; + // InternalTqcl.g:2070:1: rule__Insert__EntityClassAssignment_2 : ( RULE_ENTITY_CLASS ) ; public final void rule__Insert__EntityClassAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1874:1: ( ( RULE_ENTITY_CLASS ) ) - // InternalTqcl.g:1875:2: ( RULE_ENTITY_CLASS ) + // InternalTqcl.g:2074:1: ( ( RULE_ENTITY_CLASS ) ) + // InternalTqcl.g:2075:2: ( RULE_ENTITY_CLASS ) { - // InternalTqcl.g:1875:2: ( RULE_ENTITY_CLASS ) - // InternalTqcl.g:1876:3: RULE_ENTITY_CLASS + // InternalTqcl.g:2075:2: ( RULE_ENTITY_CLASS ) + // InternalTqcl.g:2076:3: RULE_ENTITY_CLASS { before(grammarAccess.getInsertAccess().getEntityClassENTITY_CLASSTerminalRuleCall_2_0()); match(input,RULE_ENTITY_CLASS,FOLLOW_2); @@ -5710,17 +6327,17 @@ public final void rule__Insert__EntityClassAssignment_2() throws RecognitionExce // $ANTLR start "rule__Insert__NameAssignment_4" - // InternalTqcl.g:1885:1: rule__Insert__NameAssignment_4 : ( RULE_STRING ) ; + // InternalTqcl.g:2085:1: rule__Insert__NameAssignment_4 : ( RULE_STRING ) ; public final void rule__Insert__NameAssignment_4() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1889:1: ( ( RULE_STRING ) ) - // InternalTqcl.g:1890:2: ( RULE_STRING ) + // InternalTqcl.g:2089:1: ( ( RULE_STRING ) ) + // InternalTqcl.g:2090:2: ( RULE_STRING ) { - // InternalTqcl.g:1890:2: ( RULE_STRING ) - // InternalTqcl.g:1891:3: RULE_STRING + // InternalTqcl.g:2090:2: ( RULE_STRING ) + // InternalTqcl.g:2091:3: RULE_STRING { before(grammarAccess.getInsertAccess().getNameSTRINGTerminalRuleCall_4_0()); match(input,RULE_STRING,FOLLOW_2); @@ -5747,17 +6364,17 @@ public final void rule__Insert__NameAssignment_4() throws RecognitionException { // $ANTLR start "rule__Insert__ParametersAssignment_5_1" - // InternalTqcl.g:1900:1: rule__Insert__ParametersAssignment_5_1 : ( ruleParameter ) ; + // InternalTqcl.g:2100:1: rule__Insert__ParametersAssignment_5_1 : ( ruleParameter ) ; public final void rule__Insert__ParametersAssignment_5_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1904:1: ( ( ruleParameter ) ) - // InternalTqcl.g:1905:2: ( ruleParameter ) + // InternalTqcl.g:2104:1: ( ( ruleParameter ) ) + // InternalTqcl.g:2105:2: ( ruleParameter ) { - // InternalTqcl.g:1905:2: ( ruleParameter ) - // InternalTqcl.g:1906:3: ruleParameter + // InternalTqcl.g:2105:2: ( ruleParameter ) + // InternalTqcl.g:2106:3: ruleParameter { before(grammarAccess.getInsertAccess().getParametersParameterParserRuleCall_5_1_0()); pushFollow(FOLLOW_2); @@ -5788,17 +6405,17 @@ public final void rule__Insert__ParametersAssignment_5_1() throws RecognitionExc // $ANTLR start "rule__Insert__ParametersAssignment_5_2_1" - // InternalTqcl.g:1915:1: rule__Insert__ParametersAssignment_5_2_1 : ( ruleParameter ) ; + // InternalTqcl.g:2115:1: rule__Insert__ParametersAssignment_5_2_1 : ( ruleParameter ) ; public final void rule__Insert__ParametersAssignment_5_2_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1919:1: ( ( ruleParameter ) ) - // InternalTqcl.g:1920:2: ( ruleParameter ) + // InternalTqcl.g:2119:1: ( ( ruleParameter ) ) + // InternalTqcl.g:2120:2: ( ruleParameter ) { - // InternalTqcl.g:1920:2: ( ruleParameter ) - // InternalTqcl.g:1921:3: ruleParameter + // InternalTqcl.g:2120:2: ( ruleParameter ) + // InternalTqcl.g:2121:3: ruleParameter { before(grammarAccess.getInsertAccess().getParametersParameterParserRuleCall_5_2_1_0()); pushFollow(FOLLOW_2); @@ -5829,17 +6446,17 @@ public final void rule__Insert__ParametersAssignment_5_2_1() throws RecognitionE // $ANTLR start "rule__Set__ParamAssignment_1" - // InternalTqcl.g:1930:1: rule__Set__ParamAssignment_1 : ( ruleParameter ) ; + // InternalTqcl.g:2130:1: rule__Set__ParamAssignment_1 : ( ruleParameter ) ; public final void rule__Set__ParamAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1934:1: ( ( ruleParameter ) ) - // InternalTqcl.g:1935:2: ( ruleParameter ) + // InternalTqcl.g:2134:1: ( ( ruleParameter ) ) + // InternalTqcl.g:2135:2: ( ruleParameter ) { - // InternalTqcl.g:1935:2: ( ruleParameter ) - // InternalTqcl.g:1936:3: ruleParameter + // InternalTqcl.g:2135:2: ( ruleParameter ) + // InternalTqcl.g:2136:3: ruleParameter { before(grammarAccess.getSetAccess().getParamParameterParserRuleCall_1_0()); pushFollow(FOLLOW_2); @@ -5870,17 +6487,17 @@ public final void rule__Set__ParamAssignment_1() throws RecognitionException { // $ANTLR start "rule__Connect__FromAssignment_1" - // InternalTqcl.g:1945:1: rule__Connect__FromAssignment_1 : ( ruleConnectionPort ) ; + // InternalTqcl.g:2145:1: rule__Connect__FromAssignment_1 : ( ruleConnectionPort ) ; public final void rule__Connect__FromAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1949:1: ( ( ruleConnectionPort ) ) - // InternalTqcl.g:1950:2: ( ruleConnectionPort ) + // InternalTqcl.g:2149:1: ( ( ruleConnectionPort ) ) + // InternalTqcl.g:2150:2: ( ruleConnectionPort ) { - // InternalTqcl.g:1950:2: ( ruleConnectionPort ) - // InternalTqcl.g:1951:3: ruleConnectionPort + // InternalTqcl.g:2150:2: ( ruleConnectionPort ) + // InternalTqcl.g:2151:3: ruleConnectionPort { before(grammarAccess.getConnectAccess().getFromConnectionPortParserRuleCall_1_0()); pushFollow(FOLLOW_2); @@ -5911,17 +6528,17 @@ public final void rule__Connect__FromAssignment_1() throws RecognitionException // $ANTLR start "rule__Connect__FromAssignment_2_1" - // InternalTqcl.g:1960:1: rule__Connect__FromAssignment_2_1 : ( ruleConnectionPort ) ; + // InternalTqcl.g:2160:1: rule__Connect__FromAssignment_2_1 : ( ruleConnectionPort ) ; public final void rule__Connect__FromAssignment_2_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1964:1: ( ( ruleConnectionPort ) ) - // InternalTqcl.g:1965:2: ( ruleConnectionPort ) + // InternalTqcl.g:2164:1: ( ( ruleConnectionPort ) ) + // InternalTqcl.g:2165:2: ( ruleConnectionPort ) { - // InternalTqcl.g:1965:2: ( ruleConnectionPort ) - // InternalTqcl.g:1966:3: ruleConnectionPort + // InternalTqcl.g:2165:2: ( ruleConnectionPort ) + // InternalTqcl.g:2166:3: ruleConnectionPort { before(grammarAccess.getConnectAccess().getFromConnectionPortParserRuleCall_2_1_0()); pushFollow(FOLLOW_2); @@ -5952,17 +6569,17 @@ public final void rule__Connect__FromAssignment_2_1() throws RecognitionExceptio // $ANTLR start "rule__Connect__ToAssignment_4" - // InternalTqcl.g:1975:1: rule__Connect__ToAssignment_4 : ( ruleConnectionPort ) ; + // InternalTqcl.g:2175:1: rule__Connect__ToAssignment_4 : ( ruleConnectionPort ) ; public final void rule__Connect__ToAssignment_4() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1979:1: ( ( ruleConnectionPort ) ) - // InternalTqcl.g:1980:2: ( ruleConnectionPort ) + // InternalTqcl.g:2179:1: ( ( ruleConnectionPort ) ) + // InternalTqcl.g:2180:2: ( ruleConnectionPort ) { - // InternalTqcl.g:1980:2: ( ruleConnectionPort ) - // InternalTqcl.g:1981:3: ruleConnectionPort + // InternalTqcl.g:2180:2: ( ruleConnectionPort ) + // InternalTqcl.g:2181:3: ruleConnectionPort { before(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_4_0()); pushFollow(FOLLOW_2); @@ -5993,17 +6610,17 @@ public final void rule__Connect__ToAssignment_4() throws RecognitionException { // $ANTLR start "rule__Connect__ToAssignment_5_1" - // InternalTqcl.g:1990:1: rule__Connect__ToAssignment_5_1 : ( ruleConnectionPort ) ; + // InternalTqcl.g:2190:1: rule__Connect__ToAssignment_5_1 : ( ruleConnectionPort ) ; public final void rule__Connect__ToAssignment_5_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:1994:1: ( ( ruleConnectionPort ) ) - // InternalTqcl.g:1995:2: ( ruleConnectionPort ) + // InternalTqcl.g:2194:1: ( ( ruleConnectionPort ) ) + // InternalTqcl.g:2195:2: ( ruleConnectionPort ) { - // InternalTqcl.g:1995:2: ( ruleConnectionPort ) - // InternalTqcl.g:1996:3: ruleConnectionPort + // InternalTqcl.g:2195:2: ( ruleConnectionPort ) + // InternalTqcl.g:2196:3: ruleConnectionPort { before(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_5_1_0()); pushFollow(FOLLOW_2); @@ -6033,30 +6650,30 @@ public final void rule__Connect__ToAssignment_5_1() throws RecognitionException // $ANTLR end "rule__Connect__ToAssignment_5_1" - // $ANTLR start "rule__GoInto__DirectionAssignment_1" - // InternalTqcl.g:2005:1: rule__GoInto__DirectionAssignment_1 : ( ( 'into' ) ) ; - public final void rule__GoInto__DirectionAssignment_1() throws RecognitionException { + // $ANTLR start "rule__ConnectionPort__ActorAssignment_0" + // InternalTqcl.g:2205:1: rule__ConnectionPort__ActorAssignment_0 : ( ( RULE_ID ) ) ; + public final void rule__ConnectionPort__ActorAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2009:1: ( ( ( 'into' ) ) ) - // InternalTqcl.g:2010:2: ( ( 'into' ) ) + // InternalTqcl.g:2209:1: ( ( ( RULE_ID ) ) ) + // InternalTqcl.g:2210:2: ( ( RULE_ID ) ) { - // InternalTqcl.g:2010:2: ( ( 'into' ) ) - // InternalTqcl.g:2011:3: ( 'into' ) + // InternalTqcl.g:2210:2: ( ( RULE_ID ) ) + // InternalTqcl.g:2211:3: ( RULE_ID ) { - before(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); - // InternalTqcl.g:2012:3: ( 'into' ) - // InternalTqcl.g:2013:4: 'into' + before(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); + // InternalTqcl.g:2212:3: ( RULE_ID ) + // InternalTqcl.g:2213:4: RULE_ID { - before(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); - match(input,30,FOLLOW_2); - after(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); + before(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); + match(input,RULE_ID,FOLLOW_2); + after(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); } - after(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); + after(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); } @@ -6075,29 +6692,29 @@ public final void rule__GoInto__DirectionAssignment_1() throws RecognitionExcept } return ; } - // $ANTLR end "rule__GoInto__DirectionAssignment_1" + // $ANTLR end "rule__ConnectionPort__ActorAssignment_0" - // $ANTLR start "rule__GoInto__ObjAssignment_2" - // InternalTqcl.g:2024:1: rule__GoInto__ObjAssignment_2 : ( ruleNamedObj ) ; - public final void rule__GoInto__ObjAssignment_2() throws RecognitionException { + // $ANTLR start "rule__ConnectionPort__PortAssignment_2" + // InternalTqcl.g:2224:1: rule__ConnectionPort__PortAssignment_2 : ( ruleNamedObj ) ; + public final void rule__ConnectionPort__PortAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2028:1: ( ( ruleNamedObj ) ) - // InternalTqcl.g:2029:2: ( ruleNamedObj ) + // InternalTqcl.g:2228:1: ( ( ruleNamedObj ) ) + // InternalTqcl.g:2229:2: ( ruleNamedObj ) { - // InternalTqcl.g:2029:2: ( ruleNamedObj ) - // InternalTqcl.g:2030:3: ruleNamedObj + // InternalTqcl.g:2229:2: ( ruleNamedObj ) + // InternalTqcl.g:2230:3: ruleNamedObj { - before(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); + before(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); pushFollow(FOLLOW_2); ruleNamedObj(); state._fsp--; - after(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); + after(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); } @@ -6116,33 +6733,33 @@ public final void rule__GoInto__ObjAssignment_2() throws RecognitionException { } return ; } - // $ANTLR end "rule__GoInto__ObjAssignment_2" + // $ANTLR end "rule__ConnectionPort__PortAssignment_2" - // $ANTLR start "rule__GoOut__DirectionAssignment_1" - // InternalTqcl.g:2039:1: rule__GoOut__DirectionAssignment_1 : ( ( 'out' ) ) ; - public final void rule__GoOut__DirectionAssignment_1() throws RecognitionException { + // $ANTLR start "rule__GoInto__DirectionAssignment_1" + // InternalTqcl.g:2239:1: rule__GoInto__DirectionAssignment_1 : ( ( 'into' ) ) ; + public final void rule__GoInto__DirectionAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2043:1: ( ( ( 'out' ) ) ) - // InternalTqcl.g:2044:2: ( ( 'out' ) ) + // InternalTqcl.g:2243:1: ( ( ( 'into' ) ) ) + // InternalTqcl.g:2244:2: ( ( 'into' ) ) { - // InternalTqcl.g:2044:2: ( ( 'out' ) ) - // InternalTqcl.g:2045:3: ( 'out' ) + // InternalTqcl.g:2244:2: ( ( 'into' ) ) + // InternalTqcl.g:2245:3: ( 'into' ) { - before(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); - // InternalTqcl.g:2046:3: ( 'out' ) - // InternalTqcl.g:2047:4: 'out' + before(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); + // InternalTqcl.g:2246:3: ( 'into' ) + // InternalTqcl.g:2247:4: 'into' { - before(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); - match(input,31,FOLLOW_2); - after(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); + before(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); + match(input,30,FOLLOW_2); + after(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); } - after(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); + after(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); } @@ -6161,33 +6778,33 @@ public final void rule__GoOut__DirectionAssignment_1() throws RecognitionExcepti } return ; } - // $ANTLR end "rule__GoOut__DirectionAssignment_1" + // $ANTLR end "rule__GoInto__DirectionAssignment_1" - // $ANTLR start "rule__GoTop__DirectionAssignment_1" - // InternalTqcl.g:2058:1: rule__GoTop__DirectionAssignment_1 : ( ( 'top' ) ) ; - public final void rule__GoTop__DirectionAssignment_1() throws RecognitionException { + // $ANTLR start "rule__GoInto__ActorAssignment_2" + // InternalTqcl.g:2258:1: rule__GoInto__ActorAssignment_2 : ( ( RULE_ID ) ) ; + public final void rule__GoInto__ActorAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2062:1: ( ( ( 'top' ) ) ) - // InternalTqcl.g:2063:2: ( ( 'top' ) ) + // InternalTqcl.g:2262:1: ( ( ( RULE_ID ) ) ) + // InternalTqcl.g:2263:2: ( ( RULE_ID ) ) { - // InternalTqcl.g:2063:2: ( ( 'top' ) ) - // InternalTqcl.g:2064:3: ( 'top' ) + // InternalTqcl.g:2263:2: ( ( RULE_ID ) ) + // InternalTqcl.g:2264:3: ( RULE_ID ) { - before(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); - // InternalTqcl.g:2065:3: ( 'top' ) - // InternalTqcl.g:2066:4: 'top' + before(grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); + // InternalTqcl.g:2265:3: ( RULE_ID ) + // InternalTqcl.g:2266:4: RULE_ID { - before(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); - match(input,32,FOLLOW_2); - after(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); + before(grammarAccess.getGoIntoAccess().getActorInsertIDTerminalRuleCall_2_0_1()); + match(input,RULE_ID,FOLLOW_2); + after(grammarAccess.getGoIntoAccess().getActorInsertIDTerminalRuleCall_2_0_1()); } - after(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); + after(grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); } @@ -6206,29 +6823,33 @@ public final void rule__GoTop__DirectionAssignment_1() throws RecognitionExcepti } return ; } - // $ANTLR end "rule__GoTop__DirectionAssignment_1" + // $ANTLR end "rule__GoInto__ActorAssignment_2" - // $ANTLR start "rule__Parameter__IdAssignment_0" - // InternalTqcl.g:2077:1: rule__Parameter__IdAssignment_0 : ( ruleParameter_id ) ; - public final void rule__Parameter__IdAssignment_0() throws RecognitionException { + // $ANTLR start "rule__GoOut__DirectionAssignment_1" + // InternalTqcl.g:2277:1: rule__GoOut__DirectionAssignment_1 : ( ( 'out' ) ) ; + public final void rule__GoOut__DirectionAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2081:1: ( ( ruleParameter_id ) ) - // InternalTqcl.g:2082:2: ( ruleParameter_id ) + // InternalTqcl.g:2281:1: ( ( ( 'out' ) ) ) + // InternalTqcl.g:2282:2: ( ( 'out' ) ) { - // InternalTqcl.g:2082:2: ( ruleParameter_id ) - // InternalTqcl.g:2083:3: ruleParameter_id + // InternalTqcl.g:2282:2: ( ( 'out' ) ) + // InternalTqcl.g:2283:3: ( 'out' ) { - before(grammarAccess.getParameterAccess().getIdParameter_idParserRuleCall_0_0()); - pushFollow(FOLLOW_2); - ruleParameter_id(); + before(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); + // InternalTqcl.g:2284:3: ( 'out' ) + // InternalTqcl.g:2285:4: 'out' + { + before(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); + match(input,31,FOLLOW_2); + after(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); - state._fsp--; + } - after(grammarAccess.getParameterAccess().getIdParameter_idParserRuleCall_0_0()); + after(grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); } @@ -6247,25 +6868,33 @@ public final void rule__Parameter__IdAssignment_0() throws RecognitionException } return ; } - // $ANTLR end "rule__Parameter__IdAssignment_0" + // $ANTLR end "rule__GoOut__DirectionAssignment_1" - // $ANTLR start "rule__Parameter__ValueAssignment_2" - // InternalTqcl.g:2092:1: rule__Parameter__ValueAssignment_2 : ( RULE_STRING ) ; - public final void rule__Parameter__ValueAssignment_2() throws RecognitionException { + // $ANTLR start "rule__GoTop__DirectionAssignment_1" + // InternalTqcl.g:2296:1: rule__GoTop__DirectionAssignment_1 : ( ( 'top' ) ) ; + public final void rule__GoTop__DirectionAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2096:1: ( ( RULE_STRING ) ) - // InternalTqcl.g:2097:2: ( RULE_STRING ) + // InternalTqcl.g:2300:1: ( ( ( 'top' ) ) ) + // InternalTqcl.g:2301:2: ( ( 'top' ) ) { - // InternalTqcl.g:2097:2: ( RULE_STRING ) - // InternalTqcl.g:2098:3: RULE_STRING + // InternalTqcl.g:2301:2: ( ( 'top' ) ) + // InternalTqcl.g:2302:3: ( 'top' ) { - before(grammarAccess.getParameterAccess().getValueSTRINGTerminalRuleCall_2_0()); - match(input,RULE_STRING,FOLLOW_2); - after(grammarAccess.getParameterAccess().getValueSTRINGTerminalRuleCall_2_0()); + before(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); + // InternalTqcl.g:2303:3: ( 'top' ) + // InternalTqcl.g:2304:4: 'top' + { + before(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); + match(input,32,FOLLOW_2); + after(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); + + } + + after(grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); } @@ -6284,33 +6913,29 @@ public final void rule__Parameter__ValueAssignment_2() throws RecognitionExcepti } return ; } - // $ANTLR end "rule__Parameter__ValueAssignment_2" + // $ANTLR end "rule__GoTop__DirectionAssignment_1" - // $ANTLR start "rule__ConnectionPort__ActorAssignment_0" - // InternalTqcl.g:2107:1: rule__ConnectionPort__ActorAssignment_0 : ( ( RULE_ID ) ) ; - public final void rule__ConnectionPort__ActorAssignment_0() throws RecognitionException { + // $ANTLR start "rule__Parameter__IdAssignment_0" + // InternalTqcl.g:2315:1: rule__Parameter__IdAssignment_0 : ( ruleParameter_id ) ; + public final void rule__Parameter__IdAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2111:1: ( ( ( RULE_ID ) ) ) - // InternalTqcl.g:2112:2: ( ( RULE_ID ) ) + // InternalTqcl.g:2319:1: ( ( ruleParameter_id ) ) + // InternalTqcl.g:2320:2: ( ruleParameter_id ) { - // InternalTqcl.g:2112:2: ( ( RULE_ID ) ) - // InternalTqcl.g:2113:3: ( RULE_ID ) - { - before(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); - // InternalTqcl.g:2114:3: ( RULE_ID ) - // InternalTqcl.g:2115:4: RULE_ID + // InternalTqcl.g:2320:2: ( ruleParameter_id ) + // InternalTqcl.g:2321:3: ruleParameter_id { - before(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); - match(input,RULE_ID,FOLLOW_2); - after(grammarAccess.getConnectionPortAccess().getActorInsertIDTerminalRuleCall_0_0_1()); + before(grammarAccess.getParameterAccess().getIdParameter_idParserRuleCall_0_0()); + pushFollow(FOLLOW_2); + ruleParameter_id(); - } + state._fsp--; - after(grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); + after(grammarAccess.getParameterAccess().getIdParameter_idParserRuleCall_0_0()); } @@ -6329,29 +6954,25 @@ public final void rule__ConnectionPort__ActorAssignment_0() throws RecognitionEx } return ; } - // $ANTLR end "rule__ConnectionPort__ActorAssignment_0" + // $ANTLR end "rule__Parameter__IdAssignment_0" - // $ANTLR start "rule__ConnectionPort__PortAssignment_2" - // InternalTqcl.g:2126:1: rule__ConnectionPort__PortAssignment_2 : ( ruleNamedObj ) ; - public final void rule__ConnectionPort__PortAssignment_2() throws RecognitionException { + // $ANTLR start "rule__Parameter__ValueAssignment_2" + // InternalTqcl.g:2330:1: rule__Parameter__ValueAssignment_2 : ( RULE_STRING ) ; + public final void rule__Parameter__ValueAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalTqcl.g:2130:1: ( ( ruleNamedObj ) ) - // InternalTqcl.g:2131:2: ( ruleNamedObj ) + // InternalTqcl.g:2334:1: ( ( RULE_STRING ) ) + // InternalTqcl.g:2335:2: ( RULE_STRING ) { - // InternalTqcl.g:2131:2: ( ruleNamedObj ) - // InternalTqcl.g:2132:3: ruleNamedObj + // InternalTqcl.g:2335:2: ( RULE_STRING ) + // InternalTqcl.g:2336:3: RULE_STRING { - before(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); - pushFollow(FOLLOW_2); - ruleNamedObj(); - - state._fsp--; - - after(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); + before(grammarAccess.getParameterAccess().getValueSTRINGTerminalRuleCall_2_0()); + match(input,RULE_STRING,FOLLOW_2); + after(grammarAccess.getParameterAccess().getValueSTRINGTerminalRuleCall_2_0()); } @@ -6370,7 +6991,7 @@ public final void rule__ConnectionPort__PortAssignment_2() throws RecognitionExc } return ; } - // $ANTLR end "rule__ConnectionPort__PortAssignment_2" + // $ANTLR end "rule__Parameter__ValueAssignment_2" // Delegated rules @@ -6379,24 +7000,25 @@ public final void rule__ConnectionPort__PortAssignment_2() throws RecognitionExc public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x000000000B140000L}); + public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000013140000L}); public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000080002L}); - public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000000000B140002L}); - public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000020000L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x000000000001E080L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000200000L}); - public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000400000L}); - public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000030L}); - public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000800000L}); - public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000800002L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000004800000L}); - public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000040000000L}); - public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000060L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000100000000L}); - public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000010000000L}); - public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000020000000L}); + public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000013140002L}); + public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x000000000001E080L}); + public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000200000L}); + public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000400000L}); + public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000030L}); + public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000800002L}); + public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000004800000L}); + public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000060L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000080000000L}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000020000000L}); } \ No newline at end of file diff --git a/org.eclipse.triquetrum.commands.xtext.ui/src/main/java-gen/org/eclipse/triquetrum/commands/ui/contentassist/AbstractTqclProposalProvider.java b/org.eclipse.triquetrum.commands.xtext.ui/src/main/java-gen/org/eclipse/triquetrum/commands/ui/contentassist/AbstractTqclProposalProvider.java index d24d24f5..8a06ba9e 100644 --- a/org.eclipse.triquetrum.commands.xtext.ui/src/main/java-gen/org/eclipse/triquetrum/commands/ui/contentassist/AbstractTqclProposalProvider.java +++ b/org.eclipse.triquetrum.commands.xtext.ui/src/main/java-gen/org/eclipse/triquetrum/commands/ui/contentassist/AbstractTqclProposalProvider.java @@ -13,6 +13,7 @@ package org.eclipse.triquetrum.commands.ui.contentassist; import org.eclipse.emf.ecore.EObject; +import org.eclipse.xtext.Alternatives; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.CrossReference; import org.eclipse.xtext.RuleCall; @@ -33,6 +34,16 @@ public void completeTriquetrumScript_Libraries(EObject model, Assignment assignm public void completeTriquetrumScript_Commands(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } + public void completeCompositeCommand_Start(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); + } + public void completeCompositeCommand_Commands(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); + } + public void completeCompositeCommand_End(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor); + completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(1)), context, acceptor); + } public void completeInclude_Filename(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } @@ -60,11 +71,17 @@ public void completeConnect_From(EObject model, Assignment assignment, ContentAs public void completeConnect_To(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } + public void completeConnectionPort_Actor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); + } + public void completeConnectionPort_Port(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); + } public void completeGoInto_Direction(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } - public void completeGoInto_Obj(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); + public void completeGoInto_Actor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); } public void completeGoOut_Direction(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override @@ -78,16 +95,16 @@ public void completeParameter_Id(EObject model, Assignment assignment, ContentAs public void completeParameter_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); } - public void completeConnectionPort_Actor(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - lookupCrossReference(((CrossReference)assignment.getTerminal()), context, acceptor); - } - public void completeConnectionPort_Port(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor); - } public void complete_TriquetrumScript(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } + public void complete_CompositeCommand(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override + } + public void complete_SimpleCommand(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override + } public void complete_Command(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } @@ -106,6 +123,9 @@ public void complete_Set(EObject model, RuleCall ruleCall, ContentAssistContext public void complete_Connect(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } + public void complete_ConnectionPort(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + // subclasses may override + } public void complete_GoInto(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } @@ -133,7 +153,4 @@ public void complete_NamedObj(EObject model, RuleCall ruleCall, ContentAssistCon public void complete_ENTITY_CLASS(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // subclasses may override } - public void complete_ConnectionPort(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { - // subclasses may override - } } diff --git a/org.eclipse.triquetrum.commands.xtext.ui/src/main/java/org/eclipse/triquetrum/commands/ui/contentassist/TqclProposalProvider.java b/org.eclipse.triquetrum.commands.xtext.ui/src/main/java/org/eclipse/triquetrum/commands/ui/contentassist/TqclProposalProvider.java index 709c6db2..0718d842 100644 --- a/org.eclipse.triquetrum.commands.xtext.ui/src/main/java/org/eclipse/triquetrum/commands/ui/contentassist/TqclProposalProvider.java +++ b/org.eclipse.triquetrum.commands.xtext.ui/src/main/java/org/eclipse/triquetrum/commands/ui/contentassist/TqclProposalProvider.java @@ -15,6 +15,7 @@ import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,13 +35,19 @@ import org.eclipse.triquetrum.commands.tqcl.Category; import org.eclipse.triquetrum.commands.tqcl.Insert; import org.eclipse.triquetrum.commands.tqcl.Library; +import org.eclipse.triquetrum.commands.tqcl.Parameter; import org.eclipse.triquetrum.commands.tqcl.TriquetrumScript; import org.eclipse.triquetrum.commands.validation.TqCLUtils; import org.eclipse.xtext.Assignment; -import org.eclipse.xtext.RuleCall; import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext; import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Collections2; +import com.google.inject.Guice; + /** * See * https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#content-assist @@ -70,6 +77,8 @@ public void completeInsert_EntityClass(EObject model, Assignment assignment, Con try { Insert insert = (Insert) model; + EList alreadySetParameters = insert.getParameters(); + TriquetrumScript triquetrumScript = (TriquetrumScript) insert.eContainer(); EList libraries = triquetrumScript.getLibraries(); Category category = insert.getCategory(); @@ -93,17 +102,24 @@ public void completeInsert_EntityClass(EObject model, Assignment assignment, Con case DIRECTOR: List directors = tcqlLibraryProvider.getDirectors(library.getName()); - descriptors.addAll((List) directors); for (DirectorDescriptor directorDescriptor : directors) { entityDescriptorsMap.put(directorDescriptor.getClazz(), directorDescriptor); } descriptors.addAll((List) directors); break; + case PARAMETER: + List parameters = tcqlLibraryProvider.getParameterTypes(library.getName()); + for (ParameterDescriptor parameterDescriptor : parameters) { + entityDescriptorsMap.put(parameterDescriptor.getClazz(), parameterDescriptor); + } + descriptors.addAll((List) parameters); + default: break; } } + for (EntityDescriptor key : descriptors) { ICompletionProposal completionProposal = createCompletionProposal('<' + key.getClazz() + "> as ", key.getClazz(), null, context); @@ -150,6 +166,10 @@ public void completeInsert_Parameters(EObject model, Assignment assignment, Cont entityDescriptor = tqclLibraryProvider.getDirector(TqCLUtils.cleanEntityName(entityClass)); break; + case PARAMETER: + entityDescriptor = tqclLibraryProvider.getParameter(TqCLUtils.cleanEntityName(entityClass)); + break; + default: break; } @@ -157,8 +177,30 @@ public void completeInsert_Parameters(EObject model, Assignment assignment, Cont if (entityDescriptor == null) { return; } + List parameters = entityDescriptor.getParameters(); - for (ParameterDescriptor parameterDescriptor : parameters) { + final Collection alreadyParameterSetNames = Collections2.transform(insert.getParameters(), + new Function() { + + @Override + public String apply(Parameter parameter) { + if (parameter != null && parameter.getId() != null) { + return TqCLUtils.cleanParameterName(parameter.getId()); + } else { + return null; + } + } + }); + + Collection filteredParameters = Collections2.filter(parameters, + new Predicate() { + @Override + public boolean apply(ParameterDescriptor entityDescriptor) { + return !alreadyParameterSetNames.contains(entityDescriptor.getDisplayName()); + } + }); + + for (ParameterDescriptor parameterDescriptor : filteredParameters) { String displayName = parameterDescriptor.getDisplayName(); String proposal = ""; if (displayName.contains(" ")) { diff --git a/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.ecore b/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.ecore index 1ed0abe3..06fe05ae 100644 --- a/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.ecore +++ b/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.ecore @@ -8,6 +8,12 @@ + + + + + @@ -32,9 +38,13 @@ - + + + + + - + @@ -46,8 +56,4 @@ - - - - diff --git a/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.genmodel b/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.genmodel index f907eab0..52a8a8b1 100644 --- a/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.genmodel +++ b/org.eclipse.triquetrum.commands.xtext/model/generated/Tqcl.genmodel @@ -16,6 +16,11 @@ + + + + + @@ -36,17 +41,17 @@ + + + + - + - - - - diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/Tqcl.xtextbin b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/Tqcl.xtextbin index 0f1eb82c..ef4a7d4e 100644 Binary files a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/Tqcl.xtextbin and b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/Tqcl.xtextbin differ diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.g b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.g index 62947490..1ecaa665 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.g +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.g @@ -127,15 +127,109 @@ ruleTriquetrumScript returns [EObject current=null] ) ; -// Entry rule entryRuleCommand -entryRuleCommand returns [EObject current=null]: - { newCompositeNode(grammarAccess.getCommandRule()); } - iv_ruleCommand=ruleCommand - { $current=$iv_ruleCommand.current; } +// Entry rule entryRuleCompositeCommand +entryRuleCompositeCommand returns [EObject current=null]: + { newCompositeNode(grammarAccess.getCompositeCommandRule()); } + iv_ruleCompositeCommand=ruleCompositeCommand + { $current=$iv_ruleCompositeCommand.current; } EOF; -// Rule Command -ruleCommand returns [EObject current=null] +// Rule CompositeCommand +ruleCompositeCommand returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + ( + ( + { + newCompositeNode(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); + } + lv_start_0_0=ruleGoInto + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + $current, + "start", + lv_start_0_0, + "org.eclipse.triquetrum.commands.Tqcl.GoInto"); + afterParserOrEnumRuleCall(); + } + ) + ) + ( + ( + { + newCompositeNode(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); + } + lv_commands_1_0=ruleCommand + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + add( + $current, + "commands", + lv_commands_1_0, + "org.eclipse.triquetrum.commands.Tqcl.Command"); + afterParserOrEnumRuleCall(); + } + ) + ) + ( + ( + ( + { + newCompositeNode(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); + } + lv_end_2_1=ruleGoOut + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + $current, + "end", + lv_end_2_1, + "org.eclipse.triquetrum.commands.Tqcl.GoOut"); + afterParserOrEnumRuleCall(); + } + | + { + newCompositeNode(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); + } + lv_end_2_2=ruleGoTop + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + $current, + "end", + lv_end_2_2, + "org.eclipse.triquetrum.commands.Tqcl.GoTop"); + afterParserOrEnumRuleCall(); + } + ) + ) + ) + ) +; + +// Entry rule entryRuleSimpleCommand +entryRuleSimpleCommand returns [EObject current=null]: + { newCompositeNode(grammarAccess.getSimpleCommandRule()); } + iv_ruleSimpleCommand=ruleSimpleCommand + { $current=$iv_ruleSimpleCommand.current; } + EOF; + +// Rule SimpleCommand +ruleSimpleCommand returns [EObject current=null] @init { enterRule(); } @@ -145,7 +239,7 @@ ruleCommand returns [EObject current=null] ( ( { - newCompositeNode(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); } this_Insert_0=ruleInsert { @@ -154,7 +248,7 @@ ruleCommand returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); } this_Connect_1=ruleConnect { @@ -163,7 +257,7 @@ ruleCommand returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); } this_Set_2=ruleSet { @@ -172,44 +266,53 @@ ruleCommand returns [EObject current=null] } | { - newCompositeNode(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); - } - this_GoInto_3=ruleGoInto - { - $current = $this_GoInto_3.current; - afterParserOrEnumRuleCall(); - } - | - { - newCompositeNode(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); - } - this_GoOut_4=ruleGoOut - { - $current = $this_GoOut_4.current; - afterParserOrEnumRuleCall(); - } - | - { - newCompositeNode(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); - } - this_GoTop_5=ruleGoTop - { - $current = $this_GoTop_5.current; - afterParserOrEnumRuleCall(); - } - | - { - newCompositeNode(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); } - this_Include_6=ruleInclude + this_Include_3=ruleInclude { - $current = $this_Include_6.current; + $current = $this_Include_3.current; afterParserOrEnumRuleCall(); } ) - otherlv_7=';' + otherlv_4=';' { - newLeafNode(otherlv_7, grammarAccess.getCommandAccess().getSemicolonKeyword_1()); + newLeafNode(otherlv_4, grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); + } + ) +; + +// Entry rule entryRuleCommand +entryRuleCommand returns [EObject current=null]: + { newCompositeNode(grammarAccess.getCommandRule()); } + iv_ruleCommand=ruleCommand + { $current=$iv_ruleCommand.current; } + EOF; + +// Rule Command +ruleCommand returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + { + newCompositeNode(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); + } + this_SimpleCommand_0=ruleSimpleCommand + { + $current = $this_SimpleCommand_0.current; + afterParserOrEnumRuleCall(); + } + | + { + newCompositeNode(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); + } + this_CompositeCommand_1=ruleCompositeCommand + { + $current = $this_CompositeCommand_1.current; + afterParserOrEnumRuleCall(); } ) ; @@ -593,6 +696,61 @@ ruleConnect returns [EObject current=null] ) ; +// Entry rule entryRuleConnectionPort +entryRuleConnectionPort returns [EObject current=null]: + { newCompositeNode(grammarAccess.getConnectionPortRule()); } + iv_ruleConnectionPort=ruleConnectionPort + { $current=$iv_ruleConnectionPort.current; } + EOF; + +// Rule ConnectionPort +ruleConnectionPort returns [EObject current=null] +@init { + enterRule(); +} +@after { + leaveRule(); +}: + ( + ( + ( + { + if ($current==null) { + $current = createModelElement(grammarAccess.getConnectionPortRule()); + } + } + otherlv_0=RULE_ID + { + newLeafNode(otherlv_0, grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); + } + ) + ) + otherlv_1='.' + { + newLeafNode(otherlv_1, grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); + } + ( + ( + { + newCompositeNode(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); + } + lv_port_2_0=ruleNamedObj + { + if ($current==null) { + $current = createModelElementForParent(grammarAccess.getConnectionPortRule()); + } + set( + $current, + "port", + lv_port_2_0, + "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); + afterParserOrEnumRuleCall(); + } + ) + ) + ) +; + // Entry rule entryRuleGoInto entryRuleGoInto returns [EObject current=null]: { newCompositeNode(grammarAccess.getGoIntoRule()); } @@ -629,20 +787,14 @@ ruleGoInto returns [EObject current=null] ) ( ( - { - newCompositeNode(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); - } - lv_obj_2_0=ruleNamedObj { if ($current==null) { - $current = createModelElementForParent(grammarAccess.getGoIntoRule()); + $current = createModelElement(grammarAccess.getGoIntoRule()); } - set( - $current, - "obj", - lv_obj_2_0, - "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); - afterParserOrEnumRuleCall(); + } + otherlv_2=RULE_ID + { + newLeafNode(otherlv_2, grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); } ) ) @@ -851,61 +1003,6 @@ ruleNamedObj returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken( ) ; -// Entry rule entryRuleConnectionPort -entryRuleConnectionPort returns [EObject current=null]: - { newCompositeNode(grammarAccess.getConnectionPortRule()); } - iv_ruleConnectionPort=ruleConnectionPort - { $current=$iv_ruleConnectionPort.current; } - EOF; - -// Rule ConnectionPort -ruleConnectionPort returns [EObject current=null] -@init { - enterRule(); -} -@after { - leaveRule(); -}: - ( - ( - ( - { - if ($current==null) { - $current = createModelElement(grammarAccess.getConnectionPortRule()); - } - } - otherlv_0=RULE_ID - { - newLeafNode(otherlv_0, grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); - } - ) - ) - otherlv_1='.' - { - newLeafNode(otherlv_1, grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); - } - ( - ( - { - newCompositeNode(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); - } - lv_port_2_0=ruleNamedObj - { - if ($current==null) { - $current = createModelElementForParent(grammarAccess.getConnectionPortRule()); - } - set( - $current, - "port", - lv_port_2_0, - "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); - afterParserOrEnumRuleCall(); - } - ) - ) - ) -; - // Rule Category ruleCategory returns [Enumerator current=null] @init { diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.tokens b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.tokens index c55ddbb9..17c928af 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.tokens +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqcl.tokens @@ -1,22 +1,22 @@ ','=19 -'.'=28 +'.'=23 ';'=13 -'='=27 +'='=28 'actor'=29 'as'=17 'connect'=21 'director'=32 -'go'=23 +'go'=24 'include'=14 'insert'=16 -'into'=24 +'into'=25 'library'=15 -'out'=25 +'out'=26 'parameter'=30 'port'=31 'set'=20 'to'=22 -'top'=26 +'top'=27 'with'=18 RULE_ANY_OTHER=12 RULE_ENTITY_CLASS=6 diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclLexer.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclLexer.java index 047a54e4..670a0b89 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclLexer.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclLexer.java @@ -269,11 +269,10 @@ public final void mT__23() throws RecognitionException { try { int _type = T__23; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:21:7: ( 'go' ) - // InternalTqcl.g:21:9: 'go' + // InternalTqcl.g:21:7: ( '.' ) + // InternalTqcl.g:21:9: '.' { - match("go"); - + match('.'); } @@ -290,10 +289,10 @@ public final void mT__24() throws RecognitionException { try { int _type = T__24; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:22:7: ( 'into' ) - // InternalTqcl.g:22:9: 'into' + // InternalTqcl.g:22:7: ( 'go' ) + // InternalTqcl.g:22:9: 'go' { - match("into"); + match("go"); } @@ -311,10 +310,10 @@ public final void mT__25() throws RecognitionException { try { int _type = T__25; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:23:7: ( 'out' ) - // InternalTqcl.g:23:9: 'out' + // InternalTqcl.g:23:7: ( 'into' ) + // InternalTqcl.g:23:9: 'into' { - match("out"); + match("into"); } @@ -332,10 +331,10 @@ public final void mT__26() throws RecognitionException { try { int _type = T__26; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:24:7: ( 'top' ) - // InternalTqcl.g:24:9: 'top' + // InternalTqcl.g:24:7: ( 'out' ) + // InternalTqcl.g:24:9: 'out' { - match("top"); + match("out"); } @@ -353,10 +352,11 @@ public final void mT__27() throws RecognitionException { try { int _type = T__27; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:25:7: ( '=' ) - // InternalTqcl.g:25:9: '=' + // InternalTqcl.g:25:7: ( 'top' ) + // InternalTqcl.g:25:9: 'top' { - match('='); + match("top"); + } @@ -373,10 +373,10 @@ public final void mT__28() throws RecognitionException { try { int _type = T__28; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:26:7: ( '.' ) - // InternalTqcl.g:26:9: '.' + // InternalTqcl.g:26:7: ( '=' ) + // InternalTqcl.g:26:9: '=' { - match('.'); + match('='); } @@ -477,8 +477,8 @@ public final void mRULE_PARAMETER_NAME() throws RecognitionException { try { int _type = RULE_PARAMETER_NAME; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:952:21: ( '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalTqcl.g:952:23: '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:1049:21: ( '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalTqcl.g:1049:23: '$' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { match('$'); if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { @@ -490,7 +490,7 @@ public final void mRULE_PARAMETER_NAME() throws RecognitionException { recover(mse); throw mse;} - // InternalTqcl.g:952:51: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:1049:51: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop1: do { int alt1=2; @@ -539,11 +539,11 @@ public final void mRULE_ENTITY_CLASS() throws RecognitionException { try { int _type = RULE_ENTITY_CLASS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:954:19: ( '<' ( options {greedy=false; } : . )* '>' ) - // InternalTqcl.g:954:21: '<' ( options {greedy=false; } : . )* '>' + // InternalTqcl.g:1051:19: ( '<' ( options {greedy=false; } : . )* '>' ) + // InternalTqcl.g:1051:21: '<' ( options {greedy=false; } : . )* '>' { match('<'); - // InternalTqcl.g:954:25: ( options {greedy=false; } : . )* + // InternalTqcl.g:1051:25: ( options {greedy=false; } : . )* loop2: do { int alt2=2; @@ -559,7 +559,7 @@ else if ( ((LA2_0>='\u0000' && LA2_0<='=')||(LA2_0>='?' && LA2_0<='\uFFFF')) ) { switch (alt2) { case 1 : - // InternalTqcl.g:954:53: . + // InternalTqcl.g:1051:53: . { matchAny(); @@ -588,10 +588,10 @@ public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:956:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalTqcl.g:956:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:1053:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalTqcl.g:1053:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalTqcl.g:956:11: ( '^' )? + // InternalTqcl.g:1053:11: ( '^' )? int alt3=2; int LA3_0 = input.LA(1); @@ -600,7 +600,7 @@ public final void mRULE_ID() throws RecognitionException { } switch (alt3) { case 1 : - // InternalTqcl.g:956:11: '^' + // InternalTqcl.g:1053:11: '^' { match('^'); @@ -618,7 +618,7 @@ public final void mRULE_ID() throws RecognitionException { recover(mse); throw mse;} - // InternalTqcl.g:956:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalTqcl.g:1053:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop4: do { int alt4=2; @@ -667,10 +667,10 @@ public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:958:10: ( ( '0' .. '9' )+ ) - // InternalTqcl.g:958:12: ( '0' .. '9' )+ + // InternalTqcl.g:1055:10: ( ( '0' .. '9' )+ ) + // InternalTqcl.g:1055:12: ( '0' .. '9' )+ { - // InternalTqcl.g:958:12: ( '0' .. '9' )+ + // InternalTqcl.g:1055:12: ( '0' .. '9' )+ int cnt5=0; loop5: do { @@ -684,7 +684,7 @@ public final void mRULE_INT() throws RecognitionException { switch (alt5) { case 1 : - // InternalTqcl.g:958:13: '0' .. '9' + // InternalTqcl.g:1055:13: '0' .. '9' { matchRange('0','9'); @@ -716,10 +716,10 @@ public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:960:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalTqcl.g:960:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalTqcl.g:1057:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalTqcl.g:1057:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalTqcl.g:960:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalTqcl.g:1057:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt8=2; int LA8_0 = input.LA(1); @@ -737,10 +737,10 @@ else if ( (LA8_0=='\'') ) { } switch (alt8) { case 1 : - // InternalTqcl.g:960:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalTqcl.g:1057:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalTqcl.g:960:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalTqcl.g:1057:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop6: do { int alt6=3; @@ -756,7 +756,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= switch (alt6) { case 1 : - // InternalTqcl.g:960:21: '\\\\' . + // InternalTqcl.g:1057:21: '\\\\' . { match('\\'); matchAny(); @@ -764,7 +764,7 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= } break; case 2 : - // InternalTqcl.g:960:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalTqcl.g:1057:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -789,10 +789,10 @@ else if ( ((LA6_0>='\u0000' && LA6_0<='!')||(LA6_0>='#' && LA6_0<='[')||(LA6_0>= } break; case 2 : - // InternalTqcl.g:960:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalTqcl.g:1057:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalTqcl.g:960:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalTqcl.g:1057:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop7: do { int alt7=3; @@ -808,7 +808,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>= switch (alt7) { case 1 : - // InternalTqcl.g:960:54: '\\\\' . + // InternalTqcl.g:1057:54: '\\\\' . { match('\\'); matchAny(); @@ -816,7 +816,7 @@ else if ( ((LA7_0>='\u0000' && LA7_0<='&')||(LA7_0>='(' && LA7_0<='[')||(LA7_0>= } break; case 2 : - // InternalTqcl.g:960:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalTqcl.g:1057:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -859,12 +859,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:962:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalTqcl.g:962:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalTqcl.g:1059:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalTqcl.g:1059:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalTqcl.g:962:24: ( options {greedy=false; } : . )* + // InternalTqcl.g:1059:24: ( options {greedy=false; } : . )* loop9: do { int alt9=2; @@ -889,7 +889,7 @@ else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) { switch (alt9) { case 1 : - // InternalTqcl.g:962:52: . + // InternalTqcl.g:1059:52: . { matchAny(); @@ -919,12 +919,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:964:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalTqcl.g:964:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalTqcl.g:1061:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalTqcl.g:1061:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalTqcl.g:964:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalTqcl.g:1061:24: (~ ( ( '\\n' | '\\r' ) ) )* loop10: do { int alt10=2; @@ -937,7 +937,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { switch (alt10) { case 1 : - // InternalTqcl.g:964:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalTqcl.g:1061:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -957,7 +957,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } } while (true); - // InternalTqcl.g:964:40: ( ( '\\r' )? '\\n' )? + // InternalTqcl.g:1061:40: ( ( '\\r' )? '\\n' )? int alt12=2; int LA12_0 = input.LA(1); @@ -966,9 +966,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } switch (alt12) { case 1 : - // InternalTqcl.g:964:41: ( '\\r' )? '\\n' + // InternalTqcl.g:1061:41: ( '\\r' )? '\\n' { - // InternalTqcl.g:964:41: ( '\\r' )? + // InternalTqcl.g:1061:41: ( '\\r' )? int alt11=2; int LA11_0 = input.LA(1); @@ -977,7 +977,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException { } switch (alt11) { case 1 : - // InternalTqcl.g:964:41: '\\r' + // InternalTqcl.g:1061:41: '\\r' { match('\r'); @@ -1009,10 +1009,10 @@ public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:966:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalTqcl.g:966:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalTqcl.g:1063:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalTqcl.g:1063:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalTqcl.g:966:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalTqcl.g:1063:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt13=0; loop13: do { @@ -1066,8 +1066,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalTqcl.g:968:16: ( . ) - // InternalTqcl.g:968:18: . + // InternalTqcl.g:1065:16: ( . ) + // InternalTqcl.g:1065:18: . { matchAny(); @@ -1297,19 +1297,19 @@ public void mTokens() throws RecognitionException { protected DFA14 dfa14 = new DFA14(this); static final String DFA14_eotS = - "\2\uffff\4\34\1\uffff\5\34\2\uffff\2\34\3\31\2\uffff\3\31\3\uffff\1\34\1\uffff\1\34\1\67\2\34\1\uffff\2\34\1\75\1\76\1\34\2\uffff\3\34\7\uffff\4\34\1\uffff\2\34\1\111\1\34\1\113\2\uffff\1\114\5\34\1\122\2\34\1\125\1\uffff\1\34\2\uffff\1\34\1\130\3\34\1\uffff\1\34\1\135\1\uffff\2\34\1\uffff\2\34\1\142\1\34\1\uffff\3\34\1\147\1\uffff\1\150\1\151\2\34\3\uffff\1\34\1\155\1\156\2\uffff"; + "\2\uffff\4\34\1\uffff\3\34\1\uffff\2\34\1\uffff\2\34\3\31\2\uffff\3\31\3\uffff\1\34\1\uffff\1\34\1\67\2\34\1\uffff\2\34\1\75\1\uffff\1\76\1\34\1\uffff\3\34\7\uffff\4\34\1\uffff\2\34\1\111\1\34\1\113\2\uffff\1\114\5\34\1\122\2\34\1\125\1\uffff\1\34\2\uffff\1\34\1\130\3\34\1\uffff\1\34\1\135\1\uffff\2\34\1\uffff\2\34\1\142\1\34\1\uffff\3\34\1\147\1\uffff\1\150\1\151\2\34\3\uffff\1\34\1\155\1\156\2\uffff"; static final String DFA14_eofS = "\157\uffff"; static final String DFA14_minS = - "\1\0\1\uffff\1\156\1\151\1\143\1\151\1\uffff\1\145\3\157\1\165\2\uffff\1\141\1\151\1\101\1\0\1\101\2\uffff\2\0\1\52\3\uffff\1\143\1\uffff\1\142\1\60\2\164\1\uffff\1\164\1\156\2\60\1\164\2\uffff\3\162\7\uffff\1\154\1\145\1\157\1\162\1\uffff\1\157\1\150\1\60\1\156\1\60\2\uffff\1\60\1\141\1\164\1\145\1\165\1\162\1\60\1\141\1\162\1\60\1\uffff\1\145\2\uffff\1\155\1\60\1\143\1\144\1\164\1\uffff\1\162\1\60\1\uffff\1\143\1\145\1\uffff\1\164\1\145\1\60\1\171\1\uffff\2\164\1\157\1\60\1\uffff\2\60\1\145\1\162\3\uffff\1\162\2\60\2\uffff"; + "\1\0\1\uffff\1\156\1\151\1\143\1\151\1\uffff\1\145\2\157\1\uffff\1\157\1\165\1\uffff\1\141\1\151\1\101\1\0\1\101\2\uffff\2\0\1\52\3\uffff\1\143\1\uffff\1\142\1\60\2\164\1\uffff\1\164\1\156\1\60\1\uffff\1\60\1\164\1\uffff\3\162\7\uffff\1\154\1\145\1\157\1\162\1\uffff\1\157\1\150\1\60\1\156\1\60\2\uffff\1\60\1\141\1\164\1\145\1\165\1\162\1\60\1\141\1\162\1\60\1\uffff\1\145\2\uffff\1\155\1\60\1\143\1\144\1\164\1\uffff\1\162\1\60\1\uffff\1\143\1\145\1\uffff\1\164\1\145\1\60\1\171\1\uffff\2\164\1\157\1\60\1\uffff\2\60\1\145\1\162\3\uffff\1\162\2\60\2\uffff"; static final String DFA14_maxS = - "\1\uffff\1\uffff\1\156\1\151\1\163\1\151\1\uffff\1\145\3\157\1\165\2\uffff\1\157\1\151\1\172\1\uffff\1\172\2\uffff\2\uffff\1\57\3\uffff\1\164\1\uffff\1\142\1\172\2\164\1\uffff\1\164\1\156\2\172\1\164\2\uffff\3\162\7\uffff\1\154\1\145\1\157\1\162\1\uffff\1\157\1\150\1\172\1\156\1\172\2\uffff\1\172\1\141\1\164\1\145\1\165\1\162\1\172\1\141\1\162\1\172\1\uffff\1\145\2\uffff\1\155\1\172\1\143\1\144\1\164\1\uffff\1\162\1\172\1\uffff\1\143\1\145\1\uffff\1\164\1\145\1\172\1\171\1\uffff\2\164\1\157\1\172\1\uffff\2\172\1\145\1\162\3\uffff\1\162\2\172\2\uffff"; + "\1\uffff\1\uffff\1\156\1\151\1\163\1\151\1\uffff\1\145\2\157\1\uffff\1\157\1\165\1\uffff\1\157\1\151\1\172\1\uffff\1\172\2\uffff\2\uffff\1\57\3\uffff\1\164\1\uffff\1\142\1\172\2\164\1\uffff\1\164\1\156\1\172\1\uffff\1\172\1\164\1\uffff\3\162\7\uffff\1\154\1\145\1\157\1\162\1\uffff\1\157\1\150\1\172\1\156\1\172\2\uffff\1\172\1\141\1\164\1\145\1\165\1\162\1\172\1\141\1\162\1\172\1\uffff\1\145\2\uffff\1\155\1\172\1\143\1\144\1\164\1\uffff\1\162\1\172\1\uffff\1\143\1\145\1\uffff\1\164\1\145\1\172\1\171\1\uffff\2\164\1\157\1\172\1\uffff\2\172\1\145\1\162\3\uffff\1\162\2\172\2\uffff"; static final String DFA14_acceptS = - "\1\uffff\1\1\4\uffff\1\7\5\uffff\1\17\1\20\5\uffff\1\27\1\30\3\uffff\1\34\1\35\1\1\1\uffff\1\27\4\uffff\1\7\5\uffff\1\17\1\20\3\uffff\1\25\1\26\1\30\1\31\1\32\1\33\1\34\4\uffff\1\5\5\uffff\1\12\1\13\12\uffff\1\10\1\uffff\1\16\1\15\5\uffff\1\14\2\uffff\1\6\2\uffff\1\23\4\uffff\1\21\4\uffff\1\4\4\uffff\1\2\1\3\1\11\3\uffff\1\24\1\22"; + "\1\uffff\1\1\4\uffff\1\7\3\uffff\1\13\2\uffff\1\20\5\uffff\1\27\1\30\3\uffff\1\34\1\35\1\1\1\uffff\1\27\4\uffff\1\7\3\uffff\1\13\2\uffff\1\20\3\uffff\1\25\1\26\1\30\1\31\1\32\1\33\1\34\4\uffff\1\5\5\uffff\1\12\1\14\12\uffff\1\10\1\uffff\1\17\1\16\5\uffff\1\15\2\uffff\1\6\2\uffff\1\23\4\uffff\1\21\4\uffff\1\4\4\uffff\1\2\1\3\1\11\3\uffff\1\24\1\22"; static final String DFA14_specialS = "\1\2\20\uffff\1\1\3\uffff\1\0\1\3\130\uffff}>"; static final String[] DFA14_transitionS = { - "\11\31\2\30\2\31\1\30\22\31\1\30\1\31\1\25\1\31\1\20\2\31\1\26\4\31\1\6\1\31\1\15\1\27\12\24\1\31\1\1\1\21\1\14\3\31\32\23\3\31\1\22\1\23\1\31\1\4\1\23\1\10\1\17\2\23\1\12\1\23\1\2\2\23\1\3\2\23\1\13\1\16\2\23\1\7\1\11\2\23\1\5\3\23\uff85\31", + "\11\31\2\30\2\31\1\30\22\31\1\30\1\31\1\25\1\31\1\20\2\31\1\26\4\31\1\6\1\31\1\12\1\27\12\24\1\31\1\1\1\21\1\15\3\31\32\23\3\31\1\22\1\23\1\31\1\4\1\23\1\10\1\17\2\23\1\13\1\23\1\2\2\23\1\3\2\23\1\14\1\16\2\23\1\7\1\11\2\23\1\5\3\23\uff85\31", "", "\1\33", "\1\35", @@ -1319,9 +1319,9 @@ public void mTokens() throws RecognitionException { "\1\42", "\1\43", "\1\44", - "\1\45", - "\1\46", "", + "\1\46", + "\1\47", "", "\1\51\15\uffff\1\52", "\1\53", @@ -1346,10 +1346,10 @@ public void mTokens() throws RecognitionException { "\1\72", "\1\73", "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\17\34\1\74\12\34", + "", "\12\34\7\uffff\32\34\4\uffff\1\34\1\uffff\32\34", "\1\77", "", - "", "\1\100", "\1\101", "\1\102", @@ -1500,13 +1500,13 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc else if ( (LA14_0=='t') ) {s = 9;} - else if ( (LA14_0=='g') ) {s = 10;} + else if ( (LA14_0=='.') ) {s = 10;} - else if ( (LA14_0=='o') ) {s = 11;} + else if ( (LA14_0=='g') ) {s = 11;} - else if ( (LA14_0=='=') ) {s = 12;} + else if ( (LA14_0=='o') ) {s = 12;} - else if ( (LA14_0=='.') ) {s = 13;} + else if ( (LA14_0=='=') ) {s = 13;} else if ( (LA14_0=='p') ) {s = 14;} diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclParser.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclParser.java index 7fc3b258..5b19580f 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclParser.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/parser/antlr/internal/InternalTqclParser.java @@ -34,7 +34,7 @@ @SuppressWarnings("all") public class InternalTqclParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_ENTITY_CLASS", "RULE_PARAMETER_NAME", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "';'", "'include'", "'library'", "'insert'", "'as'", "'with'", "','", "'set'", "'connect'", "'to'", "'go'", "'into'", "'out'", "'top'", "'='", "'.'", "'actor'", "'parameter'", "'port'", "'director'" + "", "", "", "", "RULE_STRING", "RULE_ID", "RULE_ENTITY_CLASS", "RULE_PARAMETER_NAME", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "';'", "'include'", "'library'", "'insert'", "'as'", "'with'", "','", "'set'", "'connect'", "'to'", "'.'", "'go'", "'into'", "'out'", "'top'", "'='", "'actor'", "'parameter'", "'port'", "'director'" }; public static final int RULE_STRING=4; public static final int RULE_SL_COMMENT=10; @@ -217,7 +217,7 @@ public final EObject ruleTriquetrumScript() throws RecognitionException { int alt2=2; int LA2_0 = input.LA(1); - if ( (LA2_0==14||LA2_0==16||(LA2_0>=20 && LA2_0<=21)||LA2_0==23) ) { + if ( (LA2_0==14||LA2_0==16||(LA2_0>=20 && LA2_0<=21)||LA2_0==24) ) { alt2=1; } @@ -282,25 +282,25 @@ public final EObject ruleTriquetrumScript() throws RecognitionException { // $ANTLR end "ruleTriquetrumScript" - // $ANTLR start "entryRuleCommand" - // InternalTqcl.g:131:1: entryRuleCommand returns [EObject current=null] : iv_ruleCommand= ruleCommand EOF ; - public final EObject entryRuleCommand() throws RecognitionException { + // $ANTLR start "entryRuleCompositeCommand" + // InternalTqcl.g:131:1: entryRuleCompositeCommand returns [EObject current=null] : iv_ruleCompositeCommand= ruleCompositeCommand EOF ; + public final EObject entryRuleCompositeCommand() throws RecognitionException { EObject current = null; - EObject iv_ruleCommand = null; + EObject iv_ruleCompositeCommand = null; try { - // InternalTqcl.g:131:48: (iv_ruleCommand= ruleCommand EOF ) - // InternalTqcl.g:132:2: iv_ruleCommand= ruleCommand EOF + // InternalTqcl.g:131:57: (iv_ruleCompositeCommand= ruleCompositeCommand EOF ) + // InternalTqcl.g:132:2: iv_ruleCompositeCommand= ruleCompositeCommand EOF { - newCompositeNode(grammarAccess.getCommandRule()); + newCompositeNode(grammarAccess.getCompositeCommandRule()); pushFollow(FOLLOW_1); - iv_ruleCommand=ruleCommand(); + iv_ruleCompositeCommand=ruleCompositeCommand(); state._fsp--; - current =iv_ruleCommand; + current =iv_ruleCompositeCommand; match(input,EOF,FOLLOW_2); } @@ -315,105 +315,308 @@ public final EObject entryRuleCommand() throws RecognitionException { } return current; } - // $ANTLR end "entryRuleCommand" + // $ANTLR end "entryRuleCompositeCommand" - // $ANTLR start "ruleCommand" - // InternalTqcl.g:138:1: ruleCommand returns [EObject current=null] : ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) otherlv_7= ';' ) ; - public final EObject ruleCommand() throws RecognitionException { + // $ANTLR start "ruleCompositeCommand" + // InternalTqcl.g:138:1: ruleCompositeCommand returns [EObject current=null] : ( ( (lv_start_0_0= ruleGoInto ) ) ( (lv_commands_1_0= ruleCommand ) ) ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) ) ; + public final EObject ruleCompositeCommand() throws RecognitionException { EObject current = null; - Token otherlv_7=null; - EObject this_Insert_0 = null; + EObject lv_start_0_0 = null; - EObject this_Connect_1 = null; + EObject lv_commands_1_0 = null; + + EObject lv_end_2_1 = null; + + EObject lv_end_2_2 = null; + + + + enterRule(); + + try { + // InternalTqcl.g:144:2: ( ( ( (lv_start_0_0= ruleGoInto ) ) ( (lv_commands_1_0= ruleCommand ) ) ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) ) ) + // InternalTqcl.g:145:2: ( ( (lv_start_0_0= ruleGoInto ) ) ( (lv_commands_1_0= ruleCommand ) ) ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) ) + { + // InternalTqcl.g:145:2: ( ( (lv_start_0_0= ruleGoInto ) ) ( (lv_commands_1_0= ruleCommand ) ) ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) ) + // InternalTqcl.g:146:3: ( (lv_start_0_0= ruleGoInto ) ) ( (lv_commands_1_0= ruleCommand ) ) ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) + { + // InternalTqcl.g:146:3: ( (lv_start_0_0= ruleGoInto ) ) + // InternalTqcl.g:147:4: (lv_start_0_0= ruleGoInto ) + { + // InternalTqcl.g:147:4: (lv_start_0_0= ruleGoInto ) + // InternalTqcl.g:148:5: lv_start_0_0= ruleGoInto + { + + newCompositeNode(grammarAccess.getCompositeCommandAccess().getStartGoIntoParserRuleCall_0_0()); + + pushFollow(FOLLOW_5); + lv_start_0_0=ruleGoInto(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + current, + "start", + lv_start_0_0, + "org.eclipse.triquetrum.commands.Tqcl.GoInto"); + afterParserOrEnumRuleCall(); + + + } + + + } + + // InternalTqcl.g:165:3: ( (lv_commands_1_0= ruleCommand ) ) + // InternalTqcl.g:166:4: (lv_commands_1_0= ruleCommand ) + { + // InternalTqcl.g:166:4: (lv_commands_1_0= ruleCommand ) + // InternalTqcl.g:167:5: lv_commands_1_0= ruleCommand + { + + newCompositeNode(grammarAccess.getCompositeCommandAccess().getCommandsCommandParserRuleCall_1_0()); + + pushFollow(FOLLOW_6); + lv_commands_1_0=ruleCommand(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + add( + current, + "commands", + lv_commands_1_0, + "org.eclipse.triquetrum.commands.Tqcl.Command"); + afterParserOrEnumRuleCall(); + + + } + + + } + + // InternalTqcl.g:184:3: ( ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) ) + // InternalTqcl.g:185:4: ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) + { + // InternalTqcl.g:185:4: ( (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) ) + // InternalTqcl.g:186:5: (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) + { + // InternalTqcl.g:186:5: (lv_end_2_1= ruleGoOut | lv_end_2_2= ruleGoTop ) + int alt3=2; + int LA3_0 = input.LA(1); + + if ( (LA3_0==24) ) { + int LA3_1 = input.LA(2); + + if ( (LA3_1==27) ) { + alt3=2; + } + else if ( (LA3_1==26) ) { + alt3=1; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 3, 1, input); + + throw nvae; + } + } + else { + NoViableAltException nvae = + new NoViableAltException("", 3, 0, input); + + throw nvae; + } + switch (alt3) { + case 1 : + // InternalTqcl.g:187:6: lv_end_2_1= ruleGoOut + { + + newCompositeNode(grammarAccess.getCompositeCommandAccess().getEndGoOutParserRuleCall_2_0_0()); + + pushFollow(FOLLOW_2); + lv_end_2_1=ruleGoOut(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + current, + "end", + lv_end_2_1, + "org.eclipse.triquetrum.commands.Tqcl.GoOut"); + afterParserOrEnumRuleCall(); + + + } + break; + case 2 : + // InternalTqcl.g:203:6: lv_end_2_2= ruleGoTop + { + + newCompositeNode(grammarAccess.getCompositeCommandAccess().getEndGoTopParserRuleCall_2_0_1()); + + pushFollow(FOLLOW_2); + lv_end_2_2=ruleGoTop(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getCompositeCommandRule()); + } + set( + current, + "end", + lv_end_2_2, + "org.eclipse.triquetrum.commands.Tqcl.GoTop"); + afterParserOrEnumRuleCall(); + + + } + break; + + } - EObject this_Set_2 = null; - EObject this_GoInto_3 = null; + } + + + } + + + } + + + } + + + leaveRule(); + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleCompositeCommand" + + + // $ANTLR start "entryRuleSimpleCommand" + // InternalTqcl.g:225:1: entryRuleSimpleCommand returns [EObject current=null] : iv_ruleSimpleCommand= ruleSimpleCommand EOF ; + public final EObject entryRuleSimpleCommand() throws RecognitionException { + EObject current = null; + + EObject iv_ruleSimpleCommand = null; + - EObject this_GoOut_4 = null; + try { + // InternalTqcl.g:225:54: (iv_ruleSimpleCommand= ruleSimpleCommand EOF ) + // InternalTqcl.g:226:2: iv_ruleSimpleCommand= ruleSimpleCommand EOF + { + newCompositeNode(grammarAccess.getSimpleCommandRule()); + pushFollow(FOLLOW_1); + iv_ruleSimpleCommand=ruleSimpleCommand(); + + state._fsp--; + + current =iv_ruleSimpleCommand; + match(input,EOF,FOLLOW_2); - EObject this_GoTop_5 = null; + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleSimpleCommand" + + + // $ANTLR start "ruleSimpleCommand" + // InternalTqcl.g:232:1: ruleSimpleCommand returns [EObject current=null] : ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) otherlv_4= ';' ) ; + public final EObject ruleSimpleCommand() throws RecognitionException { + EObject current = null; + + Token otherlv_4=null; + EObject this_Insert_0 = null; + + EObject this_Connect_1 = null; + + EObject this_Set_2 = null; - EObject this_Include_6 = null; + EObject this_Include_3 = null; enterRule(); try { - // InternalTqcl.g:144:2: ( ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) otherlv_7= ';' ) ) - // InternalTqcl.g:145:2: ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) otherlv_7= ';' ) + // InternalTqcl.g:238:2: ( ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) otherlv_4= ';' ) ) + // InternalTqcl.g:239:2: ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) otherlv_4= ';' ) { - // InternalTqcl.g:145:2: ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) otherlv_7= ';' ) - // InternalTqcl.g:146:3: (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) otherlv_7= ';' + // InternalTqcl.g:239:2: ( (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) otherlv_4= ';' ) + // InternalTqcl.g:240:3: (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) otherlv_4= ';' { - // InternalTqcl.g:146:3: (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_GoInto_3= ruleGoInto | this_GoOut_4= ruleGoOut | this_GoTop_5= ruleGoTop | this_Include_6= ruleInclude ) - int alt3=7; + // InternalTqcl.g:240:3: (this_Insert_0= ruleInsert | this_Connect_1= ruleConnect | this_Set_2= ruleSet | this_Include_3= ruleInclude ) + int alt4=4; switch ( input.LA(1) ) { case 16: { - alt3=1; + alt4=1; } break; case 21: { - alt3=2; + alt4=2; } break; case 20: { - alt3=3; - } - break; - case 23: - { - switch ( input.LA(2) ) { - case 26: - { - alt3=6; - } - break; - case 25: - { - alt3=5; - } - break; - case 24: - { - alt3=4; - } - break; - default: - NoViableAltException nvae = - new NoViableAltException("", 3, 4, input); - - throw nvae; - } - + alt4=3; } break; case 14: { - alt3=7; + alt4=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 3, 0, input); + new NoViableAltException("", 4, 0, input); throw nvae; } - switch (alt3) { + switch (alt4) { case 1 : - // InternalTqcl.g:147:4: this_Insert_0= ruleInsert + // InternalTqcl.g:241:4: this_Insert_0= ruleInsert { - newCompositeNode(grammarAccess.getCommandAccess().getInsertParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getInsertParserRuleCall_0_0()); - pushFollow(FOLLOW_5); + pushFollow(FOLLOW_7); this_Insert_0=ruleInsert(); state._fsp--; @@ -426,12 +629,12 @@ public final EObject ruleCommand() throws RecognitionException { } break; case 2 : - // InternalTqcl.g:156:4: this_Connect_1= ruleConnect + // InternalTqcl.g:250:4: this_Connect_1= ruleConnect { - newCompositeNode(grammarAccess.getCommandAccess().getConnectParserRuleCall_0_1()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getConnectParserRuleCall_0_1()); - pushFollow(FOLLOW_5); + pushFollow(FOLLOW_7); this_Connect_1=ruleConnect(); state._fsp--; @@ -444,12 +647,12 @@ public final EObject ruleCommand() throws RecognitionException { } break; case 3 : - // InternalTqcl.g:165:4: this_Set_2= ruleSet + // InternalTqcl.g:259:4: this_Set_2= ruleSet { - newCompositeNode(grammarAccess.getCommandAccess().getSetParserRuleCall_0_2()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getSetParserRuleCall_0_2()); - pushFollow(FOLLOW_5); + pushFollow(FOLLOW_7); this_Set_2=ruleSet(); state._fsp--; @@ -462,87 +665,161 @@ public final EObject ruleCommand() throws RecognitionException { } break; case 4 : - // InternalTqcl.g:174:4: this_GoInto_3= ruleGoInto + // InternalTqcl.g:268:4: this_Include_3= ruleInclude { - newCompositeNode(grammarAccess.getCommandAccess().getGoIntoParserRuleCall_0_3()); + newCompositeNode(grammarAccess.getSimpleCommandAccess().getIncludeParserRuleCall_0_3()); - pushFollow(FOLLOW_5); - this_GoInto_3=ruleGoInto(); + pushFollow(FOLLOW_7); + this_Include_3=ruleInclude(); state._fsp--; - current = this_GoInto_3; + current = this_Include_3; afterParserOrEnumRuleCall(); } break; - case 5 : - // InternalTqcl.g:183:4: this_GoOut_4= ruleGoOut - { - newCompositeNode(grammarAccess.getCommandAccess().getGoOutParserRuleCall_0_4()); - - pushFollow(FOLLOW_5); - this_GoOut_4=ruleGoOut(); + } - state._fsp--; + otherlv_4=(Token)match(input,13,FOLLOW_2); + newLeafNode(otherlv_4, grammarAccess.getSimpleCommandAccess().getSemicolonKeyword_1()); + - current = this_GoOut_4; - afterParserOrEnumRuleCall(); - + } - } - break; - case 6 : - // InternalTqcl.g:192:4: this_GoTop_5= ruleGoTop + + } + + + leaveRule(); + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleSimpleCommand" + + + // $ANTLR start "entryRuleCommand" + // InternalTqcl.g:285:1: entryRuleCommand returns [EObject current=null] : iv_ruleCommand= ruleCommand EOF ; + public final EObject entryRuleCommand() throws RecognitionException { + EObject current = null; + + EObject iv_ruleCommand = null; + + + try { + // InternalTqcl.g:285:48: (iv_ruleCommand= ruleCommand EOF ) + // InternalTqcl.g:286:2: iv_ruleCommand= ruleCommand EOF + { + newCompositeNode(grammarAccess.getCommandRule()); + pushFollow(FOLLOW_1); + iv_ruleCommand=ruleCommand(); + + state._fsp--; + + current =iv_ruleCommand; + match(input,EOF,FOLLOW_2); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleCommand" + + + // $ANTLR start "ruleCommand" + // InternalTqcl.g:292:1: ruleCommand returns [EObject current=null] : (this_SimpleCommand_0= ruleSimpleCommand | this_CompositeCommand_1= ruleCompositeCommand ) ; + public final EObject ruleCommand() throws RecognitionException { + EObject current = null; + + EObject this_SimpleCommand_0 = null; + + EObject this_CompositeCommand_1 = null; + + + + enterRule(); + + try { + // InternalTqcl.g:298:2: ( (this_SimpleCommand_0= ruleSimpleCommand | this_CompositeCommand_1= ruleCompositeCommand ) ) + // InternalTqcl.g:299:2: (this_SimpleCommand_0= ruleSimpleCommand | this_CompositeCommand_1= ruleCompositeCommand ) + { + // InternalTqcl.g:299:2: (this_SimpleCommand_0= ruleSimpleCommand | this_CompositeCommand_1= ruleCompositeCommand ) + int alt5=2; + int LA5_0 = input.LA(1); + + if ( (LA5_0==14||LA5_0==16||(LA5_0>=20 && LA5_0<=21)) ) { + alt5=1; + } + else if ( (LA5_0==24) ) { + alt5=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 5, 0, input); + + throw nvae; + } + switch (alt5) { + case 1 : + // InternalTqcl.g:300:3: this_SimpleCommand_0= ruleSimpleCommand { - newCompositeNode(grammarAccess.getCommandAccess().getGoTopParserRuleCall_0_5()); - - pushFollow(FOLLOW_5); - this_GoTop_5=ruleGoTop(); + newCompositeNode(grammarAccess.getCommandAccess().getSimpleCommandParserRuleCall_0()); + + pushFollow(FOLLOW_2); + this_SimpleCommand_0=ruleSimpleCommand(); state._fsp--; - current = this_GoTop_5; - afterParserOrEnumRuleCall(); - + current = this_SimpleCommand_0; + afterParserOrEnumRuleCall(); + } break; - case 7 : - // InternalTqcl.g:201:4: this_Include_6= ruleInclude + case 2 : + // InternalTqcl.g:309:3: this_CompositeCommand_1= ruleCompositeCommand { - newCompositeNode(grammarAccess.getCommandAccess().getIncludeParserRuleCall_0_6()); - - pushFollow(FOLLOW_5); - this_Include_6=ruleInclude(); + newCompositeNode(grammarAccess.getCommandAccess().getCompositeCommandParserRuleCall_1()); + + pushFollow(FOLLOW_2); + this_CompositeCommand_1=ruleCompositeCommand(); state._fsp--; - current = this_Include_6; - afterParserOrEnumRuleCall(); - + current = this_CompositeCommand_1; + afterParserOrEnumRuleCall(); + } break; } - otherlv_7=(Token)match(input,13,FOLLOW_2); - - newLeafNode(otherlv_7, grammarAccess.getCommandAccess().getSemicolonKeyword_1()); - - - } - } @@ -563,7 +840,7 @@ public final EObject ruleCommand() throws RecognitionException { // $ANTLR start "entryRuleInclude" - // InternalTqcl.g:218:1: entryRuleInclude returns [EObject current=null] : iv_ruleInclude= ruleInclude EOF ; + // InternalTqcl.g:321:1: entryRuleInclude returns [EObject current=null] : iv_ruleInclude= ruleInclude EOF ; public final EObject entryRuleInclude() throws RecognitionException { EObject current = null; @@ -571,8 +848,8 @@ public final EObject entryRuleInclude() throws RecognitionException { try { - // InternalTqcl.g:218:48: (iv_ruleInclude= ruleInclude EOF ) - // InternalTqcl.g:219:2: iv_ruleInclude= ruleInclude EOF + // InternalTqcl.g:321:48: (iv_ruleInclude= ruleInclude EOF ) + // InternalTqcl.g:322:2: iv_ruleInclude= ruleInclude EOF { newCompositeNode(grammarAccess.getIncludeRule()); pushFollow(FOLLOW_1); @@ -599,7 +876,7 @@ public final EObject entryRuleInclude() throws RecognitionException { // $ANTLR start "ruleInclude" - // InternalTqcl.g:225:1: ruleInclude returns [EObject current=null] : (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) ; + // InternalTqcl.g:328:1: ruleInclude returns [EObject current=null] : (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) ; public final EObject ruleInclude() throws RecognitionException { EObject current = null; @@ -611,23 +888,23 @@ public final EObject ruleInclude() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:231:2: ( (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) ) - // InternalTqcl.g:232:2: (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) + // InternalTqcl.g:334:2: ( (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) ) + // InternalTqcl.g:335:2: (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) { - // InternalTqcl.g:232:2: (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) - // InternalTqcl.g:233:3: otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' + // InternalTqcl.g:335:2: (otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' ) + // InternalTqcl.g:336:3: otherlv_0= 'include' ( (lv_filename_1_0= RULE_STRING ) ) otherlv_2= ';' { - otherlv_0=(Token)match(input,14,FOLLOW_6); + otherlv_0=(Token)match(input,14,FOLLOW_8); newLeafNode(otherlv_0, grammarAccess.getIncludeAccess().getIncludeKeyword_0()); - // InternalTqcl.g:237:3: ( (lv_filename_1_0= RULE_STRING ) ) - // InternalTqcl.g:238:4: (lv_filename_1_0= RULE_STRING ) + // InternalTqcl.g:340:3: ( (lv_filename_1_0= RULE_STRING ) ) + // InternalTqcl.g:341:4: (lv_filename_1_0= RULE_STRING ) { - // InternalTqcl.g:238:4: (lv_filename_1_0= RULE_STRING ) - // InternalTqcl.g:239:5: lv_filename_1_0= RULE_STRING + // InternalTqcl.g:341:4: (lv_filename_1_0= RULE_STRING ) + // InternalTqcl.g:342:5: lv_filename_1_0= RULE_STRING { - lv_filename_1_0=(Token)match(input,RULE_STRING,FOLLOW_5); + lv_filename_1_0=(Token)match(input,RULE_STRING,FOLLOW_7); newLeafNode(lv_filename_1_0, grammarAccess.getIncludeAccess().getFilenameSTRINGTerminalRuleCall_1_0()); @@ -674,7 +951,7 @@ public final EObject ruleInclude() throws RecognitionException { // $ANTLR start "entryRuleLibrary" - // InternalTqcl.g:263:1: entryRuleLibrary returns [EObject current=null] : iv_ruleLibrary= ruleLibrary EOF ; + // InternalTqcl.g:366:1: entryRuleLibrary returns [EObject current=null] : iv_ruleLibrary= ruleLibrary EOF ; public final EObject entryRuleLibrary() throws RecognitionException { EObject current = null; @@ -682,8 +959,8 @@ public final EObject entryRuleLibrary() throws RecognitionException { try { - // InternalTqcl.g:263:48: (iv_ruleLibrary= ruleLibrary EOF ) - // InternalTqcl.g:264:2: iv_ruleLibrary= ruleLibrary EOF + // InternalTqcl.g:366:48: (iv_ruleLibrary= ruleLibrary EOF ) + // InternalTqcl.g:367:2: iv_ruleLibrary= ruleLibrary EOF { newCompositeNode(grammarAccess.getLibraryRule()); pushFollow(FOLLOW_1); @@ -710,7 +987,7 @@ public final EObject entryRuleLibrary() throws RecognitionException { // $ANTLR start "ruleLibrary" - // InternalTqcl.g:270:1: ruleLibrary returns [EObject current=null] : (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) ; + // InternalTqcl.g:373:1: ruleLibrary returns [EObject current=null] : (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) ; public final EObject ruleLibrary() throws RecognitionException { EObject current = null; @@ -722,23 +999,23 @@ public final EObject ruleLibrary() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:276:2: ( (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) ) - // InternalTqcl.g:277:2: (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) + // InternalTqcl.g:379:2: ( (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) ) + // InternalTqcl.g:380:2: (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) { - // InternalTqcl.g:277:2: (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) - // InternalTqcl.g:278:3: otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' + // InternalTqcl.g:380:2: (otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' ) + // InternalTqcl.g:381:3: otherlv_0= 'library' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= ';' { - otherlv_0=(Token)match(input,15,FOLLOW_7); + otherlv_0=(Token)match(input,15,FOLLOW_9); newLeafNode(otherlv_0, grammarAccess.getLibraryAccess().getLibraryKeyword_0()); - // InternalTqcl.g:282:3: ( (lv_name_1_0= RULE_ID ) ) - // InternalTqcl.g:283:4: (lv_name_1_0= RULE_ID ) + // InternalTqcl.g:385:3: ( (lv_name_1_0= RULE_ID ) ) + // InternalTqcl.g:386:4: (lv_name_1_0= RULE_ID ) { - // InternalTqcl.g:283:4: (lv_name_1_0= RULE_ID ) - // InternalTqcl.g:284:5: lv_name_1_0= RULE_ID + // InternalTqcl.g:386:4: (lv_name_1_0= RULE_ID ) + // InternalTqcl.g:387:5: lv_name_1_0= RULE_ID { - lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_5); + lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_7); newLeafNode(lv_name_1_0, grammarAccess.getLibraryAccess().getNameIDTerminalRuleCall_1_0()); @@ -785,7 +1062,7 @@ public final EObject ruleLibrary() throws RecognitionException { // $ANTLR start "entryRuleInsert" - // InternalTqcl.g:308:1: entryRuleInsert returns [EObject current=null] : iv_ruleInsert= ruleInsert EOF ; + // InternalTqcl.g:411:1: entryRuleInsert returns [EObject current=null] : iv_ruleInsert= ruleInsert EOF ; public final EObject entryRuleInsert() throws RecognitionException { EObject current = null; @@ -793,8 +1070,8 @@ public final EObject entryRuleInsert() throws RecognitionException { try { - // InternalTqcl.g:308:47: (iv_ruleInsert= ruleInsert EOF ) - // InternalTqcl.g:309:2: iv_ruleInsert= ruleInsert EOF + // InternalTqcl.g:411:47: (iv_ruleInsert= ruleInsert EOF ) + // InternalTqcl.g:412:2: iv_ruleInsert= ruleInsert EOF { newCompositeNode(grammarAccess.getInsertRule()); pushFollow(FOLLOW_1); @@ -821,7 +1098,7 @@ public final EObject entryRuleInsert() throws RecognitionException { // $ANTLR start "ruleInsert" - // InternalTqcl.g:315:1: ruleInsert returns [EObject current=null] : (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) ; + // InternalTqcl.g:418:1: ruleInsert returns [EObject current=null] : (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) ; public final EObject ruleInsert() throws RecognitionException { EObject current = null; @@ -842,34 +1119,34 @@ public final EObject ruleInsert() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:321:2: ( (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) ) - // InternalTqcl.g:322:2: (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) + // InternalTqcl.g:424:2: ( (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) ) + // InternalTqcl.g:425:2: (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) { - // InternalTqcl.g:322:2: (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) - // InternalTqcl.g:323:3: otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? + // InternalTqcl.g:425:2: (otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? ) + // InternalTqcl.g:426:3: otherlv_0= 'insert' ( (lv_category_1_0= ruleCategory ) )? ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) otherlv_3= 'as' ( (lv_name_4_0= RULE_STRING ) ) (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? { - otherlv_0=(Token)match(input,16,FOLLOW_8); + otherlv_0=(Token)match(input,16,FOLLOW_10); newLeafNode(otherlv_0, grammarAccess.getInsertAccess().getInsertKeyword_0()); - // InternalTqcl.g:327:3: ( (lv_category_1_0= ruleCategory ) )? - int alt4=2; - int LA4_0 = input.LA(1); + // InternalTqcl.g:430:3: ( (lv_category_1_0= ruleCategory ) )? + int alt6=2; + int LA6_0 = input.LA(1); - if ( ((LA4_0>=29 && LA4_0<=32)) ) { - alt4=1; + if ( ((LA6_0>=29 && LA6_0<=32)) ) { + alt6=1; } - switch (alt4) { + switch (alt6) { case 1 : - // InternalTqcl.g:328:4: (lv_category_1_0= ruleCategory ) + // InternalTqcl.g:431:4: (lv_category_1_0= ruleCategory ) { - // InternalTqcl.g:328:4: (lv_category_1_0= ruleCategory ) - // InternalTqcl.g:329:5: lv_category_1_0= ruleCategory + // InternalTqcl.g:431:4: (lv_category_1_0= ruleCategory ) + // InternalTqcl.g:432:5: lv_category_1_0= ruleCategory { newCompositeNode(grammarAccess.getInsertAccess().getCategoryCategoryEnumRuleCall_1_0()); - pushFollow(FOLLOW_9); + pushFollow(FOLLOW_11); lv_category_1_0=ruleCategory(); state._fsp--; @@ -894,13 +1171,13 @@ public final EObject ruleInsert() throws RecognitionException { } - // InternalTqcl.g:346:3: ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) - // InternalTqcl.g:347:4: (lv_entityClass_2_0= RULE_ENTITY_CLASS ) + // InternalTqcl.g:449:3: ( (lv_entityClass_2_0= RULE_ENTITY_CLASS ) ) + // InternalTqcl.g:450:4: (lv_entityClass_2_0= RULE_ENTITY_CLASS ) { - // InternalTqcl.g:347:4: (lv_entityClass_2_0= RULE_ENTITY_CLASS ) - // InternalTqcl.g:348:5: lv_entityClass_2_0= RULE_ENTITY_CLASS + // InternalTqcl.g:450:4: (lv_entityClass_2_0= RULE_ENTITY_CLASS ) + // InternalTqcl.g:451:5: lv_entityClass_2_0= RULE_ENTITY_CLASS { - lv_entityClass_2_0=(Token)match(input,RULE_ENTITY_CLASS,FOLLOW_10); + lv_entityClass_2_0=(Token)match(input,RULE_ENTITY_CLASS,FOLLOW_12); newLeafNode(lv_entityClass_2_0, grammarAccess.getInsertAccess().getEntityClassENTITY_CLASSTerminalRuleCall_2_0()); @@ -920,17 +1197,17 @@ public final EObject ruleInsert() throws RecognitionException { } - otherlv_3=(Token)match(input,17,FOLLOW_6); + otherlv_3=(Token)match(input,17,FOLLOW_8); newLeafNode(otherlv_3, grammarAccess.getInsertAccess().getAsKeyword_3()); - // InternalTqcl.g:368:3: ( (lv_name_4_0= RULE_STRING ) ) - // InternalTqcl.g:369:4: (lv_name_4_0= RULE_STRING ) + // InternalTqcl.g:471:3: ( (lv_name_4_0= RULE_STRING ) ) + // InternalTqcl.g:472:4: (lv_name_4_0= RULE_STRING ) { - // InternalTqcl.g:369:4: (lv_name_4_0= RULE_STRING ) - // InternalTqcl.g:370:5: lv_name_4_0= RULE_STRING + // InternalTqcl.g:472:4: (lv_name_4_0= RULE_STRING ) + // InternalTqcl.g:473:5: lv_name_4_0= RULE_STRING { - lv_name_4_0=(Token)match(input,RULE_STRING,FOLLOW_11); + lv_name_4_0=(Token)match(input,RULE_STRING,FOLLOW_13); newLeafNode(lv_name_4_0, grammarAccess.getInsertAccess().getNameSTRINGTerminalRuleCall_4_0()); @@ -950,31 +1227,31 @@ public final EObject ruleInsert() throws RecognitionException { } - // InternalTqcl.g:386:3: (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? - int alt6=2; - int LA6_0 = input.LA(1); + // InternalTqcl.g:489:3: (otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* )? + int alt8=2; + int LA8_0 = input.LA(1); - if ( (LA6_0==18) ) { - alt6=1; + if ( (LA8_0==18) ) { + alt8=1; } - switch (alt6) { + switch (alt8) { case 1 : - // InternalTqcl.g:387:4: otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* + // InternalTqcl.g:490:4: otherlv_5= 'with' ( (lv_parameters_6_0= ruleParameter ) ) (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* { - otherlv_5=(Token)match(input,18,FOLLOW_12); + otherlv_5=(Token)match(input,18,FOLLOW_14); newLeafNode(otherlv_5, grammarAccess.getInsertAccess().getWithKeyword_5_0()); - // InternalTqcl.g:391:4: ( (lv_parameters_6_0= ruleParameter ) ) - // InternalTqcl.g:392:5: (lv_parameters_6_0= ruleParameter ) + // InternalTqcl.g:494:4: ( (lv_parameters_6_0= ruleParameter ) ) + // InternalTqcl.g:495:5: (lv_parameters_6_0= ruleParameter ) { - // InternalTqcl.g:392:5: (lv_parameters_6_0= ruleParameter ) - // InternalTqcl.g:393:6: lv_parameters_6_0= ruleParameter + // InternalTqcl.g:495:5: (lv_parameters_6_0= ruleParameter ) + // InternalTqcl.g:496:6: lv_parameters_6_0= ruleParameter { newCompositeNode(grammarAccess.getInsertAccess().getParametersParameterParserRuleCall_5_1_0()); - pushFollow(FOLLOW_13); + pushFollow(FOLLOW_15); lv_parameters_6_0=ruleParameter(); state._fsp--; @@ -996,35 +1273,35 @@ public final EObject ruleInsert() throws RecognitionException { } - // InternalTqcl.g:410:4: (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* - loop5: + // InternalTqcl.g:513:4: (otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) )* + loop7: do { - int alt5=2; - int LA5_0 = input.LA(1); + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA5_0==19) ) { - alt5=1; + if ( (LA7_0==19) ) { + alt7=1; } - switch (alt5) { + switch (alt7) { case 1 : - // InternalTqcl.g:411:5: otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) + // InternalTqcl.g:514:5: otherlv_7= ',' ( (lv_parameters_8_0= ruleParameter ) ) { - otherlv_7=(Token)match(input,19,FOLLOW_12); + otherlv_7=(Token)match(input,19,FOLLOW_14); newLeafNode(otherlv_7, grammarAccess.getInsertAccess().getCommaKeyword_5_2_0()); - // InternalTqcl.g:415:5: ( (lv_parameters_8_0= ruleParameter ) ) - // InternalTqcl.g:416:6: (lv_parameters_8_0= ruleParameter ) + // InternalTqcl.g:518:5: ( (lv_parameters_8_0= ruleParameter ) ) + // InternalTqcl.g:519:6: (lv_parameters_8_0= ruleParameter ) { - // InternalTqcl.g:416:6: (lv_parameters_8_0= ruleParameter ) - // InternalTqcl.g:417:7: lv_parameters_8_0= ruleParameter + // InternalTqcl.g:519:6: (lv_parameters_8_0= ruleParameter ) + // InternalTqcl.g:520:7: lv_parameters_8_0= ruleParameter { newCompositeNode(grammarAccess.getInsertAccess().getParametersParameterParserRuleCall_5_2_1_0()); - pushFollow(FOLLOW_13); + pushFollow(FOLLOW_15); lv_parameters_8_0=ruleParameter(); state._fsp--; @@ -1051,7 +1328,7 @@ public final EObject ruleInsert() throws RecognitionException { break; default : - break loop5; + break loop7; } } while (true); @@ -1084,7 +1361,7 @@ public final EObject ruleInsert() throws RecognitionException { // $ANTLR start "entryRuleSet" - // InternalTqcl.g:440:1: entryRuleSet returns [EObject current=null] : iv_ruleSet= ruleSet EOF ; + // InternalTqcl.g:543:1: entryRuleSet returns [EObject current=null] : iv_ruleSet= ruleSet EOF ; public final EObject entryRuleSet() throws RecognitionException { EObject current = null; @@ -1092,8 +1369,8 @@ public final EObject entryRuleSet() throws RecognitionException { try { - // InternalTqcl.g:440:44: (iv_ruleSet= ruleSet EOF ) - // InternalTqcl.g:441:2: iv_ruleSet= ruleSet EOF + // InternalTqcl.g:543:44: (iv_ruleSet= ruleSet EOF ) + // InternalTqcl.g:544:2: iv_ruleSet= ruleSet EOF { newCompositeNode(grammarAccess.getSetRule()); pushFollow(FOLLOW_1); @@ -1120,7 +1397,7 @@ public final EObject entryRuleSet() throws RecognitionException { // $ANTLR start "ruleSet" - // InternalTqcl.g:447:1: ruleSet returns [EObject current=null] : (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) ; + // InternalTqcl.g:550:1: ruleSet returns [EObject current=null] : (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) ; public final EObject ruleSet() throws RecognitionException { EObject current = null; @@ -1132,21 +1409,21 @@ public final EObject ruleSet() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:453:2: ( (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) ) - // InternalTqcl.g:454:2: (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) + // InternalTqcl.g:556:2: ( (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) ) + // InternalTqcl.g:557:2: (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) { - // InternalTqcl.g:454:2: (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) - // InternalTqcl.g:455:3: otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) + // InternalTqcl.g:557:2: (otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) ) + // InternalTqcl.g:558:3: otherlv_0= 'set' ( (lv_param_1_0= ruleParameter ) ) { - otherlv_0=(Token)match(input,20,FOLLOW_12); + otherlv_0=(Token)match(input,20,FOLLOW_14); newLeafNode(otherlv_0, grammarAccess.getSetAccess().getSetKeyword_0()); - // InternalTqcl.g:459:3: ( (lv_param_1_0= ruleParameter ) ) - // InternalTqcl.g:460:4: (lv_param_1_0= ruleParameter ) + // InternalTqcl.g:562:3: ( (lv_param_1_0= ruleParameter ) ) + // InternalTqcl.g:563:4: (lv_param_1_0= ruleParameter ) { - // InternalTqcl.g:460:4: (lv_param_1_0= ruleParameter ) - // InternalTqcl.g:461:5: lv_param_1_0= ruleParameter + // InternalTqcl.g:563:4: (lv_param_1_0= ruleParameter ) + // InternalTqcl.g:564:5: lv_param_1_0= ruleParameter { newCompositeNode(grammarAccess.getSetAccess().getParamParameterParserRuleCall_1_0()); @@ -1196,7 +1473,7 @@ public final EObject ruleSet() throws RecognitionException { // $ANTLR start "entryRuleConnect" - // InternalTqcl.g:482:1: entryRuleConnect returns [EObject current=null] : iv_ruleConnect= ruleConnect EOF ; + // InternalTqcl.g:585:1: entryRuleConnect returns [EObject current=null] : iv_ruleConnect= ruleConnect EOF ; public final EObject entryRuleConnect() throws RecognitionException { EObject current = null; @@ -1204,8 +1481,8 @@ public final EObject entryRuleConnect() throws RecognitionException { try { - // InternalTqcl.g:482:48: (iv_ruleConnect= ruleConnect EOF ) - // InternalTqcl.g:483:2: iv_ruleConnect= ruleConnect EOF + // InternalTqcl.g:585:48: (iv_ruleConnect= ruleConnect EOF ) + // InternalTqcl.g:586:2: iv_ruleConnect= ruleConnect EOF { newCompositeNode(grammarAccess.getConnectRule()); pushFollow(FOLLOW_1); @@ -1232,7 +1509,7 @@ public final EObject entryRuleConnect() throws RecognitionException { // $ANTLR start "ruleConnect" - // InternalTqcl.g:489:1: ruleConnect returns [EObject current=null] : (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) ; + // InternalTqcl.g:592:1: ruleConnect returns [EObject current=null] : (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) ; public final EObject ruleConnect() throws RecognitionException { EObject current = null; @@ -1253,26 +1530,26 @@ public final EObject ruleConnect() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:495:2: ( (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) ) - // InternalTqcl.g:496:2: (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) + // InternalTqcl.g:598:2: ( (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) ) + // InternalTqcl.g:599:2: (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) { - // InternalTqcl.g:496:2: (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) - // InternalTqcl.g:497:3: otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* + // InternalTqcl.g:599:2: (otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* ) + // InternalTqcl.g:600:3: otherlv_0= 'connect' ( (lv_from_1_0= ruleConnectionPort ) ) (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* otherlv_4= 'to' ( (lv_to_5_0= ruleConnectionPort ) ) (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* { - otherlv_0=(Token)match(input,21,FOLLOW_7); + otherlv_0=(Token)match(input,21,FOLLOW_9); newLeafNode(otherlv_0, grammarAccess.getConnectAccess().getConnectKeyword_0()); - // InternalTqcl.g:501:3: ( (lv_from_1_0= ruleConnectionPort ) ) - // InternalTqcl.g:502:4: (lv_from_1_0= ruleConnectionPort ) + // InternalTqcl.g:604:3: ( (lv_from_1_0= ruleConnectionPort ) ) + // InternalTqcl.g:605:4: (lv_from_1_0= ruleConnectionPort ) { - // InternalTqcl.g:502:4: (lv_from_1_0= ruleConnectionPort ) - // InternalTqcl.g:503:5: lv_from_1_0= ruleConnectionPort + // InternalTqcl.g:605:4: (lv_from_1_0= ruleConnectionPort ) + // InternalTqcl.g:606:5: lv_from_1_0= ruleConnectionPort { newCompositeNode(grammarAccess.getConnectAccess().getFromConnectionPortParserRuleCall_1_0()); - pushFollow(FOLLOW_14); + pushFollow(FOLLOW_16); lv_from_1_0=ruleConnectionPort(); state._fsp--; @@ -1294,92 +1571,285 @@ public final EObject ruleConnect() throws RecognitionException { } - // InternalTqcl.g:520:3: (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* - loop7: + // InternalTqcl.g:623:3: (otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) )* + loop9: + do { + int alt9=2; + int LA9_0 = input.LA(1); + + if ( (LA9_0==19) ) { + alt9=1; + } + + + switch (alt9) { + case 1 : + // InternalTqcl.g:624:4: otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) + { + otherlv_2=(Token)match(input,19,FOLLOW_9); + + newLeafNode(otherlv_2, grammarAccess.getConnectAccess().getCommaKeyword_2_0()); + + // InternalTqcl.g:628:4: ( (lv_from_3_0= ruleConnectionPort ) ) + // InternalTqcl.g:629:5: (lv_from_3_0= ruleConnectionPort ) + { + // InternalTqcl.g:629:5: (lv_from_3_0= ruleConnectionPort ) + // InternalTqcl.g:630:6: lv_from_3_0= ruleConnectionPort + { + + newCompositeNode(grammarAccess.getConnectAccess().getFromConnectionPortParserRuleCall_2_1_0()); + + pushFollow(FOLLOW_16); + lv_from_3_0=ruleConnectionPort(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getConnectRule()); + } + add( + current, + "from", + lv_from_3_0, + "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); + afterParserOrEnumRuleCall(); + + + } + + + } + + + } + break; + + default : + break loop9; + } + } while (true); + + otherlv_4=(Token)match(input,22,FOLLOW_9); + + newLeafNode(otherlv_4, grammarAccess.getConnectAccess().getToKeyword_3()); + + // InternalTqcl.g:652:3: ( (lv_to_5_0= ruleConnectionPort ) ) + // InternalTqcl.g:653:4: (lv_to_5_0= ruleConnectionPort ) + { + // InternalTqcl.g:653:4: (lv_to_5_0= ruleConnectionPort ) + // InternalTqcl.g:654:5: lv_to_5_0= ruleConnectionPort + { + + newCompositeNode(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_4_0()); + + pushFollow(FOLLOW_15); + lv_to_5_0=ruleConnectionPort(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getConnectRule()); + } + add( + current, + "to", + lv_to_5_0, + "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); + afterParserOrEnumRuleCall(); + + + } + + + } + + // InternalTqcl.g:671:3: (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* + loop10: do { - int alt7=2; - int LA7_0 = input.LA(1); + int alt10=2; + int LA10_0 = input.LA(1); + + if ( (LA10_0==19) ) { + alt10=1; + } + + + switch (alt10) { + case 1 : + // InternalTqcl.g:672:4: otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) + { + otherlv_6=(Token)match(input,19,FOLLOW_9); + + newLeafNode(otherlv_6, grammarAccess.getConnectAccess().getCommaKeyword_5_0()); + + // InternalTqcl.g:676:4: ( (lv_to_7_0= ruleConnectionPort ) ) + // InternalTqcl.g:677:5: (lv_to_7_0= ruleConnectionPort ) + { + // InternalTqcl.g:677:5: (lv_to_7_0= ruleConnectionPort ) + // InternalTqcl.g:678:6: lv_to_7_0= ruleConnectionPort + { + + newCompositeNode(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_5_1_0()); + + pushFollow(FOLLOW_15); + lv_to_7_0=ruleConnectionPort(); + + state._fsp--; + + + if (current==null) { + current = createModelElementForParent(grammarAccess.getConnectRule()); + } + add( + current, + "to", + lv_to_7_0, + "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); + afterParserOrEnumRuleCall(); + + + } + + + } + + + } + break; - if ( (LA7_0==19) ) { - alt7=1; + default : + break loop10; } + } while (true); + + + } + + + } + + + leaveRule(); + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleConnect" + + + // $ANTLR start "entryRuleConnectionPort" + // InternalTqcl.g:700:1: entryRuleConnectionPort returns [EObject current=null] : iv_ruleConnectionPort= ruleConnectionPort EOF ; + public final EObject entryRuleConnectionPort() throws RecognitionException { + EObject current = null; + EObject iv_ruleConnectionPort = null; + + + try { + // InternalTqcl.g:700:55: (iv_ruleConnectionPort= ruleConnectionPort EOF ) + // InternalTqcl.g:701:2: iv_ruleConnectionPort= ruleConnectionPort EOF + { + newCompositeNode(grammarAccess.getConnectionPortRule()); + pushFollow(FOLLOW_1); + iv_ruleConnectionPort=ruleConnectionPort(); + + state._fsp--; + + current =iv_ruleConnectionPort; + match(input,EOF,FOLLOW_2); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleConnectionPort" - switch (alt7) { - case 1 : - // InternalTqcl.g:521:4: otherlv_2= ',' ( (lv_from_3_0= ruleConnectionPort ) ) - { - otherlv_2=(Token)match(input,19,FOLLOW_7); - newLeafNode(otherlv_2, grammarAccess.getConnectAccess().getCommaKeyword_2_0()); - - // InternalTqcl.g:525:4: ( (lv_from_3_0= ruleConnectionPort ) ) - // InternalTqcl.g:526:5: (lv_from_3_0= ruleConnectionPort ) - { - // InternalTqcl.g:526:5: (lv_from_3_0= ruleConnectionPort ) - // InternalTqcl.g:527:6: lv_from_3_0= ruleConnectionPort - { + // $ANTLR start "ruleConnectionPort" + // InternalTqcl.g:707:1: ruleConnectionPort returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) ; + public final EObject ruleConnectionPort() throws RecognitionException { + EObject current = null; - newCompositeNode(grammarAccess.getConnectAccess().getFromConnectionPortParserRuleCall_2_1_0()); - - pushFollow(FOLLOW_14); - lv_from_3_0=ruleConnectionPort(); + Token otherlv_0=null; + Token otherlv_1=null; + AntlrDatatypeRuleToken lv_port_2_0 = null; - state._fsp--; - if (current==null) { - current = createModelElementForParent(grammarAccess.getConnectRule()); - } - add( - current, - "from", - lv_from_3_0, - "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); - afterParserOrEnumRuleCall(); - + enterRule(); - } + try { + // InternalTqcl.g:713:2: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) ) + // InternalTqcl.g:714:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) + { + // InternalTqcl.g:714:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) + // InternalTqcl.g:715:3: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) + { + // InternalTqcl.g:715:3: ( (otherlv_0= RULE_ID ) ) + // InternalTqcl.g:716:4: (otherlv_0= RULE_ID ) + { + // InternalTqcl.g:716:4: (otherlv_0= RULE_ID ) + // InternalTqcl.g:717:5: otherlv_0= RULE_ID + { + if (current==null) { + current = createModelElement(grammarAccess.getConnectionPortRule()); + } + + otherlv_0=(Token)match(input,RULE_ID,FOLLOW_17); - } + newLeafNode(otherlv_0, grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); + + } - } - break; - default : - break loop7; - } - } while (true); + } - otherlv_4=(Token)match(input,22,FOLLOW_7); + otherlv_1=(Token)match(input,23,FOLLOW_18); - newLeafNode(otherlv_4, grammarAccess.getConnectAccess().getToKeyword_3()); + newLeafNode(otherlv_1, grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); - // InternalTqcl.g:549:3: ( (lv_to_5_0= ruleConnectionPort ) ) - // InternalTqcl.g:550:4: (lv_to_5_0= ruleConnectionPort ) + // InternalTqcl.g:732:3: ( (lv_port_2_0= ruleNamedObj ) ) + // InternalTqcl.g:733:4: (lv_port_2_0= ruleNamedObj ) { - // InternalTqcl.g:550:4: (lv_to_5_0= ruleConnectionPort ) - // InternalTqcl.g:551:5: lv_to_5_0= ruleConnectionPort + // InternalTqcl.g:733:4: (lv_port_2_0= ruleNamedObj ) + // InternalTqcl.g:734:5: lv_port_2_0= ruleNamedObj { - newCompositeNode(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_4_0()); + newCompositeNode(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); - pushFollow(FOLLOW_13); - lv_to_5_0=ruleConnectionPort(); + pushFollow(FOLLOW_2); + lv_port_2_0=ruleNamedObj(); state._fsp--; if (current==null) { - current = createModelElementForParent(grammarAccess.getConnectRule()); + current = createModelElementForParent(grammarAccess.getConnectionPortRule()); } - add( + set( current, - "to", - lv_to_5_0, - "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); + "port", + lv_port_2_0, + "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); afterParserOrEnumRuleCall(); @@ -1388,65 +1858,6 @@ public final EObject ruleConnect() throws RecognitionException { } - // InternalTqcl.g:568:3: (otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) )* - loop8: - do { - int alt8=2; - int LA8_0 = input.LA(1); - - if ( (LA8_0==19) ) { - alt8=1; - } - - - switch (alt8) { - case 1 : - // InternalTqcl.g:569:4: otherlv_6= ',' ( (lv_to_7_0= ruleConnectionPort ) ) - { - otherlv_6=(Token)match(input,19,FOLLOW_7); - - newLeafNode(otherlv_6, grammarAccess.getConnectAccess().getCommaKeyword_5_0()); - - // InternalTqcl.g:573:4: ( (lv_to_7_0= ruleConnectionPort ) ) - // InternalTqcl.g:574:5: (lv_to_7_0= ruleConnectionPort ) - { - // InternalTqcl.g:574:5: (lv_to_7_0= ruleConnectionPort ) - // InternalTqcl.g:575:6: lv_to_7_0= ruleConnectionPort - { - - newCompositeNode(grammarAccess.getConnectAccess().getToConnectionPortParserRuleCall_5_1_0()); - - pushFollow(FOLLOW_13); - lv_to_7_0=ruleConnectionPort(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getConnectRule()); - } - add( - current, - "to", - lv_to_7_0, - "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); - afterParserOrEnumRuleCall(); - - - } - - - } - - - } - break; - - default : - break loop8; - } - } while (true); - } @@ -1466,11 +1877,11 @@ public final EObject ruleConnect() throws RecognitionException { } return current; } - // $ANTLR end "ruleConnect" + // $ANTLR end "ruleConnectionPort" // $ANTLR start "entryRuleGoInto" - // InternalTqcl.g:597:1: entryRuleGoInto returns [EObject current=null] : iv_ruleGoInto= ruleGoInto EOF ; + // InternalTqcl.g:755:1: entryRuleGoInto returns [EObject current=null] : iv_ruleGoInto= ruleGoInto EOF ; public final EObject entryRuleGoInto() throws RecognitionException { EObject current = null; @@ -1478,8 +1889,8 @@ public final EObject entryRuleGoInto() throws RecognitionException { try { - // InternalTqcl.g:597:47: (iv_ruleGoInto= ruleGoInto EOF ) - // InternalTqcl.g:598:2: iv_ruleGoInto= ruleGoInto EOF + // InternalTqcl.g:755:47: (iv_ruleGoInto= ruleGoInto EOF ) + // InternalTqcl.g:756:2: iv_ruleGoInto= ruleGoInto EOF { newCompositeNode(grammarAccess.getGoIntoRule()); pushFollow(FOLLOW_1); @@ -1506,36 +1917,35 @@ public final EObject entryRuleGoInto() throws RecognitionException { // $ANTLR start "ruleGoInto" - // InternalTqcl.g:604:1: ruleGoInto returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (lv_obj_2_0= ruleNamedObj ) ) ) ; + // InternalTqcl.g:762:1: ruleGoInto returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (otherlv_2= RULE_ID ) ) ) ; public final EObject ruleGoInto() throws RecognitionException { EObject current = null; Token otherlv_0=null; Token lv_direction_1_0=null; - AntlrDatatypeRuleToken lv_obj_2_0 = null; - + Token otherlv_2=null; enterRule(); try { - // InternalTqcl.g:610:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (lv_obj_2_0= ruleNamedObj ) ) ) ) - // InternalTqcl.g:611:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (lv_obj_2_0= ruleNamedObj ) ) ) + // InternalTqcl.g:768:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (otherlv_2= RULE_ID ) ) ) ) + // InternalTqcl.g:769:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (otherlv_2= RULE_ID ) ) ) { - // InternalTqcl.g:611:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (lv_obj_2_0= ruleNamedObj ) ) ) - // InternalTqcl.g:612:3: otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (lv_obj_2_0= ruleNamedObj ) ) + // InternalTqcl.g:769:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (otherlv_2= RULE_ID ) ) ) + // InternalTqcl.g:770:3: otherlv_0= 'go' ( (lv_direction_1_0= 'into' ) ) ( (otherlv_2= RULE_ID ) ) { - otherlv_0=(Token)match(input,23,FOLLOW_15); + otherlv_0=(Token)match(input,24,FOLLOW_19); newLeafNode(otherlv_0, grammarAccess.getGoIntoAccess().getGoKeyword_0()); - // InternalTqcl.g:616:3: ( (lv_direction_1_0= 'into' ) ) - // InternalTqcl.g:617:4: (lv_direction_1_0= 'into' ) + // InternalTqcl.g:774:3: ( (lv_direction_1_0= 'into' ) ) + // InternalTqcl.g:775:4: (lv_direction_1_0= 'into' ) { - // InternalTqcl.g:617:4: (lv_direction_1_0= 'into' ) - // InternalTqcl.g:618:5: lv_direction_1_0= 'into' + // InternalTqcl.g:775:4: (lv_direction_1_0= 'into' ) + // InternalTqcl.g:776:5: lv_direction_1_0= 'into' { - lv_direction_1_0=(Token)match(input,24,FOLLOW_16); + lv_direction_1_0=(Token)match(input,25,FOLLOW_9); newLeafNode(lv_direction_1_0, grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0()); @@ -1551,30 +1961,20 @@ public final EObject ruleGoInto() throws RecognitionException { } - // InternalTqcl.g:630:3: ( (lv_obj_2_0= ruleNamedObj ) ) - // InternalTqcl.g:631:4: (lv_obj_2_0= ruleNamedObj ) + // InternalTqcl.g:788:3: ( (otherlv_2= RULE_ID ) ) + // InternalTqcl.g:789:4: (otherlv_2= RULE_ID ) { - // InternalTqcl.g:631:4: (lv_obj_2_0= ruleNamedObj ) - // InternalTqcl.g:632:5: lv_obj_2_0= ruleNamedObj + // InternalTqcl.g:789:4: (otherlv_2= RULE_ID ) + // InternalTqcl.g:790:5: otherlv_2= RULE_ID { - newCompositeNode(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0()); - - pushFollow(FOLLOW_2); - lv_obj_2_0=ruleNamedObj(); - - state._fsp--; - - if (current==null) { - current = createModelElementForParent(grammarAccess.getGoIntoRule()); + current = createModelElement(grammarAccess.getGoIntoRule()); } - set( - current, - "obj", - lv_obj_2_0, - "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); - afterParserOrEnumRuleCall(); + + otherlv_2=(Token)match(input,RULE_ID,FOLLOW_2); + + newLeafNode(otherlv_2, grammarAccess.getGoIntoAccess().getActorInsertCrossReference_2_0()); } @@ -1605,7 +2005,7 @@ public final EObject ruleGoInto() throws RecognitionException { // $ANTLR start "entryRuleGoOut" - // InternalTqcl.g:653:1: entryRuleGoOut returns [EObject current=null] : iv_ruleGoOut= ruleGoOut EOF ; + // InternalTqcl.g:805:1: entryRuleGoOut returns [EObject current=null] : iv_ruleGoOut= ruleGoOut EOF ; public final EObject entryRuleGoOut() throws RecognitionException { EObject current = null; @@ -1613,8 +2013,8 @@ public final EObject entryRuleGoOut() throws RecognitionException { try { - // InternalTqcl.g:653:46: (iv_ruleGoOut= ruleGoOut EOF ) - // InternalTqcl.g:654:2: iv_ruleGoOut= ruleGoOut EOF + // InternalTqcl.g:805:46: (iv_ruleGoOut= ruleGoOut EOF ) + // InternalTqcl.g:806:2: iv_ruleGoOut= ruleGoOut EOF { newCompositeNode(grammarAccess.getGoOutRule()); pushFollow(FOLLOW_1); @@ -1641,7 +2041,7 @@ public final EObject entryRuleGoOut() throws RecognitionException { // $ANTLR start "ruleGoOut" - // InternalTqcl.g:660:1: ruleGoOut returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) ; + // InternalTqcl.g:812:1: ruleGoOut returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) ; public final EObject ruleGoOut() throws RecognitionException { EObject current = null; @@ -1652,23 +2052,23 @@ public final EObject ruleGoOut() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:666:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) ) - // InternalTqcl.g:667:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) + // InternalTqcl.g:818:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) ) + // InternalTqcl.g:819:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) { - // InternalTqcl.g:667:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) - // InternalTqcl.g:668:3: otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) + // InternalTqcl.g:819:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) ) + // InternalTqcl.g:820:3: otherlv_0= 'go' ( (lv_direction_1_0= 'out' ) ) { - otherlv_0=(Token)match(input,23,FOLLOW_17); + otherlv_0=(Token)match(input,24,FOLLOW_20); newLeafNode(otherlv_0, grammarAccess.getGoOutAccess().getGoKeyword_0()); - // InternalTqcl.g:672:3: ( (lv_direction_1_0= 'out' ) ) - // InternalTqcl.g:673:4: (lv_direction_1_0= 'out' ) + // InternalTqcl.g:824:3: ( (lv_direction_1_0= 'out' ) ) + // InternalTqcl.g:825:4: (lv_direction_1_0= 'out' ) { - // InternalTqcl.g:673:4: (lv_direction_1_0= 'out' ) - // InternalTqcl.g:674:5: lv_direction_1_0= 'out' + // InternalTqcl.g:825:4: (lv_direction_1_0= 'out' ) + // InternalTqcl.g:826:5: lv_direction_1_0= 'out' { - lv_direction_1_0=(Token)match(input,25,FOLLOW_2); + lv_direction_1_0=(Token)match(input,26,FOLLOW_2); newLeafNode(lv_direction_1_0, grammarAccess.getGoOutAccess().getDirectionOutKeyword_1_0()); @@ -1707,7 +2107,7 @@ public final EObject ruleGoOut() throws RecognitionException { // $ANTLR start "entryRuleGoTop" - // InternalTqcl.g:690:1: entryRuleGoTop returns [EObject current=null] : iv_ruleGoTop= ruleGoTop EOF ; + // InternalTqcl.g:842:1: entryRuleGoTop returns [EObject current=null] : iv_ruleGoTop= ruleGoTop EOF ; public final EObject entryRuleGoTop() throws RecognitionException { EObject current = null; @@ -1715,8 +2115,8 @@ public final EObject entryRuleGoTop() throws RecognitionException { try { - // InternalTqcl.g:690:46: (iv_ruleGoTop= ruleGoTop EOF ) - // InternalTqcl.g:691:2: iv_ruleGoTop= ruleGoTop EOF + // InternalTqcl.g:842:46: (iv_ruleGoTop= ruleGoTop EOF ) + // InternalTqcl.g:843:2: iv_ruleGoTop= ruleGoTop EOF { newCompositeNode(grammarAccess.getGoTopRule()); pushFollow(FOLLOW_1); @@ -1743,7 +2143,7 @@ public final EObject entryRuleGoTop() throws RecognitionException { // $ANTLR start "ruleGoTop" - // InternalTqcl.g:697:1: ruleGoTop returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) ; + // InternalTqcl.g:849:1: ruleGoTop returns [EObject current=null] : (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) ; public final EObject ruleGoTop() throws RecognitionException { EObject current = null; @@ -1754,23 +2154,23 @@ public final EObject ruleGoTop() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:703:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) ) - // InternalTqcl.g:704:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) + // InternalTqcl.g:855:2: ( (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) ) + // InternalTqcl.g:856:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) { - // InternalTqcl.g:704:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) - // InternalTqcl.g:705:3: otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) + // InternalTqcl.g:856:2: (otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) ) + // InternalTqcl.g:857:3: otherlv_0= 'go' ( (lv_direction_1_0= 'top' ) ) { - otherlv_0=(Token)match(input,23,FOLLOW_18); + otherlv_0=(Token)match(input,24,FOLLOW_21); newLeafNode(otherlv_0, grammarAccess.getGoTopAccess().getGoKeyword_0()); - // InternalTqcl.g:709:3: ( (lv_direction_1_0= 'top' ) ) - // InternalTqcl.g:710:4: (lv_direction_1_0= 'top' ) + // InternalTqcl.g:861:3: ( (lv_direction_1_0= 'top' ) ) + // InternalTqcl.g:862:4: (lv_direction_1_0= 'top' ) { - // InternalTqcl.g:710:4: (lv_direction_1_0= 'top' ) - // InternalTqcl.g:711:5: lv_direction_1_0= 'top' + // InternalTqcl.g:862:4: (lv_direction_1_0= 'top' ) + // InternalTqcl.g:863:5: lv_direction_1_0= 'top' { - lv_direction_1_0=(Token)match(input,26,FOLLOW_2); + lv_direction_1_0=(Token)match(input,27,FOLLOW_2); newLeafNode(lv_direction_1_0, grammarAccess.getGoTopAccess().getDirectionTopKeyword_1_0()); @@ -1809,7 +2209,7 @@ public final EObject ruleGoTop() throws RecognitionException { // $ANTLR start "entryRuleParameter" - // InternalTqcl.g:727:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; + // InternalTqcl.g:879:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; public final EObject entryRuleParameter() throws RecognitionException { EObject current = null; @@ -1817,8 +2217,8 @@ public final EObject entryRuleParameter() throws RecognitionException { try { - // InternalTqcl.g:727:50: (iv_ruleParameter= ruleParameter EOF ) - // InternalTqcl.g:728:2: iv_ruleParameter= ruleParameter EOF + // InternalTqcl.g:879:50: (iv_ruleParameter= ruleParameter EOF ) + // InternalTqcl.g:880:2: iv_ruleParameter= ruleParameter EOF { newCompositeNode(grammarAccess.getParameterRule()); pushFollow(FOLLOW_1); @@ -1845,7 +2245,7 @@ public final EObject entryRuleParameter() throws RecognitionException { // $ANTLR start "ruleParameter" - // InternalTqcl.g:734:1: ruleParameter returns [EObject current=null] : ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) ; + // InternalTqcl.g:886:1: ruleParameter returns [EObject current=null] : ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) ; public final EObject ruleParameter() throws RecognitionException { EObject current = null; @@ -1858,22 +2258,22 @@ public final EObject ruleParameter() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:740:2: ( ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) ) - // InternalTqcl.g:741:2: ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) + // InternalTqcl.g:892:2: ( ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) ) + // InternalTqcl.g:893:2: ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) { - // InternalTqcl.g:741:2: ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) - // InternalTqcl.g:742:3: ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) + // InternalTqcl.g:893:2: ( ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) ) + // InternalTqcl.g:894:3: ( (lv_id_0_0= ruleParameter_id ) ) otherlv_1= '=' ( (lv_value_2_0= RULE_STRING ) ) { - // InternalTqcl.g:742:3: ( (lv_id_0_0= ruleParameter_id ) ) - // InternalTqcl.g:743:4: (lv_id_0_0= ruleParameter_id ) + // InternalTqcl.g:894:3: ( (lv_id_0_0= ruleParameter_id ) ) + // InternalTqcl.g:895:4: (lv_id_0_0= ruleParameter_id ) { - // InternalTqcl.g:743:4: (lv_id_0_0= ruleParameter_id ) - // InternalTqcl.g:744:5: lv_id_0_0= ruleParameter_id + // InternalTqcl.g:895:4: (lv_id_0_0= ruleParameter_id ) + // InternalTqcl.g:896:5: lv_id_0_0= ruleParameter_id { newCompositeNode(grammarAccess.getParameterAccess().getIdParameter_idParserRuleCall_0_0()); - pushFollow(FOLLOW_19); + pushFollow(FOLLOW_22); lv_id_0_0=ruleParameter_id(); state._fsp--; @@ -1895,15 +2295,15 @@ public final EObject ruleParameter() throws RecognitionException { } - otherlv_1=(Token)match(input,27,FOLLOW_6); + otherlv_1=(Token)match(input,28,FOLLOW_8); newLeafNode(otherlv_1, grammarAccess.getParameterAccess().getEqualsSignKeyword_1()); - // InternalTqcl.g:765:3: ( (lv_value_2_0= RULE_STRING ) ) - // InternalTqcl.g:766:4: (lv_value_2_0= RULE_STRING ) + // InternalTqcl.g:917:3: ( (lv_value_2_0= RULE_STRING ) ) + // InternalTqcl.g:918:4: (lv_value_2_0= RULE_STRING ) { - // InternalTqcl.g:766:4: (lv_value_2_0= RULE_STRING ) - // InternalTqcl.g:767:5: lv_value_2_0= RULE_STRING + // InternalTqcl.g:918:4: (lv_value_2_0= RULE_STRING ) + // InternalTqcl.g:919:5: lv_value_2_0= RULE_STRING { lv_value_2_0=(Token)match(input,RULE_STRING,FOLLOW_2); @@ -1948,7 +2348,7 @@ public final EObject ruleParameter() throws RecognitionException { // $ANTLR start "entryRuleParameter_id" - // InternalTqcl.g:787:1: entryRuleParameter_id returns [String current=null] : iv_ruleParameter_id= ruleParameter_id EOF ; + // InternalTqcl.g:939:1: entryRuleParameter_id returns [String current=null] : iv_ruleParameter_id= ruleParameter_id EOF ; public final String entryRuleParameter_id() throws RecognitionException { String current = null; @@ -1956,8 +2356,8 @@ public final String entryRuleParameter_id() throws RecognitionException { try { - // InternalTqcl.g:787:52: (iv_ruleParameter_id= ruleParameter_id EOF ) - // InternalTqcl.g:788:2: iv_ruleParameter_id= ruleParameter_id EOF + // InternalTqcl.g:939:52: (iv_ruleParameter_id= ruleParameter_id EOF ) + // InternalTqcl.g:940:2: iv_ruleParameter_id= ruleParameter_id EOF { newCompositeNode(grammarAccess.getParameter_idRule()); pushFollow(FOLLOW_1); @@ -1984,7 +2384,7 @@ public final String entryRuleParameter_id() throws RecognitionException { // $ANTLR start "ruleParameter_id" - // InternalTqcl.g:794:1: ruleParameter_id returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) ; + // InternalTqcl.g:946:1: ruleParameter_id returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) ; public final AntlrDatatypeRuleToken ruleParameter_id() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -1995,28 +2395,28 @@ public final AntlrDatatypeRuleToken ruleParameter_id() throws RecognitionExcepti enterRule(); try { - // InternalTqcl.g:800:2: ( (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) ) - // InternalTqcl.g:801:2: (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) + // InternalTqcl.g:952:2: ( (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) ) + // InternalTqcl.g:953:2: (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) { - // InternalTqcl.g:801:2: (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) - int alt9=2; - int LA9_0 = input.LA(1); + // InternalTqcl.g:953:2: (this_PARAMETER_NAME_0= RULE_PARAMETER_NAME | this_STRING_1= RULE_STRING ) + int alt11=2; + int LA11_0 = input.LA(1); - if ( (LA9_0==RULE_PARAMETER_NAME) ) { - alt9=1; + if ( (LA11_0==RULE_PARAMETER_NAME) ) { + alt11=1; } - else if ( (LA9_0==RULE_STRING) ) { - alt9=2; + else if ( (LA11_0==RULE_STRING) ) { + alt11=2; } else { NoViableAltException nvae = - new NoViableAltException("", 9, 0, input); + new NoViableAltException("", 11, 0, input); throw nvae; } - switch (alt9) { + switch (alt11) { case 1 : - // InternalTqcl.g:802:3: this_PARAMETER_NAME_0= RULE_PARAMETER_NAME + // InternalTqcl.g:954:3: this_PARAMETER_NAME_0= RULE_PARAMETER_NAME { this_PARAMETER_NAME_0=(Token)match(input,RULE_PARAMETER_NAME,FOLLOW_2); @@ -2029,7 +2429,7 @@ else if ( (LA9_0==RULE_STRING) ) { } break; case 2 : - // InternalTqcl.g:810:3: this_STRING_1= RULE_STRING + // InternalTqcl.g:962:3: this_STRING_1= RULE_STRING { this_STRING_1=(Token)match(input,RULE_STRING,FOLLOW_2); @@ -2064,7 +2464,7 @@ else if ( (LA9_0==RULE_STRING) ) { // $ANTLR start "entryRuleNamedObj" - // InternalTqcl.g:821:1: entryRuleNamedObj returns [String current=null] : iv_ruleNamedObj= ruleNamedObj EOF ; + // InternalTqcl.g:973:1: entryRuleNamedObj returns [String current=null] : iv_ruleNamedObj= ruleNamedObj EOF ; public final String entryRuleNamedObj() throws RecognitionException { String current = null; @@ -2072,8 +2472,8 @@ public final String entryRuleNamedObj() throws RecognitionException { try { - // InternalTqcl.g:821:48: (iv_ruleNamedObj= ruleNamedObj EOF ) - // InternalTqcl.g:822:2: iv_ruleNamedObj= ruleNamedObj EOF + // InternalTqcl.g:973:48: (iv_ruleNamedObj= ruleNamedObj EOF ) + // InternalTqcl.g:974:2: iv_ruleNamedObj= ruleNamedObj EOF { newCompositeNode(grammarAccess.getNamedObjRule()); pushFollow(FOLLOW_1); @@ -2100,7 +2500,7 @@ public final String entryRuleNamedObj() throws RecognitionException { // $ANTLR start "ruleNamedObj" - // InternalTqcl.g:828:1: ruleNamedObj returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) ; + // InternalTqcl.g:980:1: ruleNamedObj returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) ; public final AntlrDatatypeRuleToken ruleNamedObj() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -2111,28 +2511,28 @@ public final AntlrDatatypeRuleToken ruleNamedObj() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:834:2: ( (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) ) - // InternalTqcl.g:835:2: (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) + // InternalTqcl.g:986:2: ( (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) ) + // InternalTqcl.g:987:2: (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) { - // InternalTqcl.g:835:2: (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) - int alt10=2; - int LA10_0 = input.LA(1); + // InternalTqcl.g:987:2: (this_ID_0= RULE_ID | this_STRING_1= RULE_STRING ) + int alt12=2; + int LA12_0 = input.LA(1); - if ( (LA10_0==RULE_ID) ) { - alt10=1; + if ( (LA12_0==RULE_ID) ) { + alt12=1; } - else if ( (LA10_0==RULE_STRING) ) { - alt10=2; + else if ( (LA12_0==RULE_STRING) ) { + alt12=2; } else { NoViableAltException nvae = - new NoViableAltException("", 10, 0, input); + new NoViableAltException("", 12, 0, input); throw nvae; } - switch (alt10) { + switch (alt12) { case 1 : - // InternalTqcl.g:836:3: this_ID_0= RULE_ID + // InternalTqcl.g:988:3: this_ID_0= RULE_ID { this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); @@ -2145,7 +2545,7 @@ else if ( (LA10_0==RULE_STRING) ) { } break; case 2 : - // InternalTqcl.g:844:3: this_STRING_1= RULE_STRING + // InternalTqcl.g:996:3: this_STRING_1= RULE_STRING { this_STRING_1=(Token)match(input,RULE_STRING,FOLLOW_2); @@ -2179,142 +2579,8 @@ else if ( (LA10_0==RULE_STRING) ) { // $ANTLR end "ruleNamedObj" - // $ANTLR start "entryRuleConnectionPort" - // InternalTqcl.g:855:1: entryRuleConnectionPort returns [EObject current=null] : iv_ruleConnectionPort= ruleConnectionPort EOF ; - public final EObject entryRuleConnectionPort() throws RecognitionException { - EObject current = null; - - EObject iv_ruleConnectionPort = null; - - - try { - // InternalTqcl.g:855:55: (iv_ruleConnectionPort= ruleConnectionPort EOF ) - // InternalTqcl.g:856:2: iv_ruleConnectionPort= ruleConnectionPort EOF - { - newCompositeNode(grammarAccess.getConnectionPortRule()); - pushFollow(FOLLOW_1); - iv_ruleConnectionPort=ruleConnectionPort(); - - state._fsp--; - - current =iv_ruleConnectionPort; - match(input,EOF,FOLLOW_2); - - } - - } - - catch (RecognitionException re) { - recover(input,re); - appendSkippedTokens(); - } - finally { - } - return current; - } - // $ANTLR end "entryRuleConnectionPort" - - - // $ANTLR start "ruleConnectionPort" - // InternalTqcl.g:862:1: ruleConnectionPort returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) ; - public final EObject ruleConnectionPort() throws RecognitionException { - EObject current = null; - - Token otherlv_0=null; - Token otherlv_1=null; - AntlrDatatypeRuleToken lv_port_2_0 = null; - - - - enterRule(); - - try { - // InternalTqcl.g:868:2: ( ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) ) - // InternalTqcl.g:869:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) - { - // InternalTqcl.g:869:2: ( ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) ) - // InternalTqcl.g:870:3: ( (otherlv_0= RULE_ID ) ) otherlv_1= '.' ( (lv_port_2_0= ruleNamedObj ) ) - { - // InternalTqcl.g:870:3: ( (otherlv_0= RULE_ID ) ) - // InternalTqcl.g:871:4: (otherlv_0= RULE_ID ) - { - // InternalTqcl.g:871:4: (otherlv_0= RULE_ID ) - // InternalTqcl.g:872:5: otherlv_0= RULE_ID - { - - if (current==null) { - current = createModelElement(grammarAccess.getConnectionPortRule()); - } - - otherlv_0=(Token)match(input,RULE_ID,FOLLOW_20); - - newLeafNode(otherlv_0, grammarAccess.getConnectionPortAccess().getActorInsertCrossReference_0_0()); - - - } - - - } - - otherlv_1=(Token)match(input,28,FOLLOW_16); - - newLeafNode(otherlv_1, grammarAccess.getConnectionPortAccess().getFullStopKeyword_1()); - - // InternalTqcl.g:887:3: ( (lv_port_2_0= ruleNamedObj ) ) - // InternalTqcl.g:888:4: (lv_port_2_0= ruleNamedObj ) - { - // InternalTqcl.g:888:4: (lv_port_2_0= ruleNamedObj ) - // InternalTqcl.g:889:5: lv_port_2_0= ruleNamedObj - { - - newCompositeNode(grammarAccess.getConnectionPortAccess().getPortNamedObjParserRuleCall_2_0()); - - pushFollow(FOLLOW_2); - lv_port_2_0=ruleNamedObj(); - - state._fsp--; - - - if (current==null) { - current = createModelElementForParent(grammarAccess.getConnectionPortRule()); - } - set( - current, - "port", - lv_port_2_0, - "org.eclipse.triquetrum.commands.Tqcl.NamedObj"); - afterParserOrEnumRuleCall(); - - - } - - - } - - - } - - - } - - - leaveRule(); - - } - - catch (RecognitionException re) { - recover(input,re); - appendSkippedTokens(); - } - finally { - } - return current; - } - // $ANTLR end "ruleConnectionPort" - - // $ANTLR start "ruleCategory" - // InternalTqcl.g:910:1: ruleCategory returns [Enumerator current=null] : ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) ; + // InternalTqcl.g:1007:1: ruleCategory returns [Enumerator current=null] : ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) ; public final Enumerator ruleCategory() throws RecognitionException { Enumerator current = null; @@ -2327,45 +2593,45 @@ public final Enumerator ruleCategory() throws RecognitionException { enterRule(); try { - // InternalTqcl.g:916:2: ( ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) ) - // InternalTqcl.g:917:2: ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) + // InternalTqcl.g:1013:2: ( ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) ) + // InternalTqcl.g:1014:2: ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) { - // InternalTqcl.g:917:2: ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) - int alt11=4; + // InternalTqcl.g:1014:2: ( (enumLiteral_0= 'actor' ) | (enumLiteral_1= 'parameter' ) | (enumLiteral_2= 'port' ) | (enumLiteral_3= 'director' ) ) + int alt13=4; switch ( input.LA(1) ) { case 29: { - alt11=1; + alt13=1; } break; case 30: { - alt11=2; + alt13=2; } break; case 31: { - alt11=3; + alt13=3; } break; case 32: { - alt11=4; + alt13=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 11, 0, input); + new NoViableAltException("", 13, 0, input); throw nvae; } - switch (alt11) { + switch (alt13) { case 1 : - // InternalTqcl.g:918:3: (enumLiteral_0= 'actor' ) + // InternalTqcl.g:1015:3: (enumLiteral_0= 'actor' ) { - // InternalTqcl.g:918:3: (enumLiteral_0= 'actor' ) - // InternalTqcl.g:919:4: enumLiteral_0= 'actor' + // InternalTqcl.g:1015:3: (enumLiteral_0= 'actor' ) + // InternalTqcl.g:1016:4: enumLiteral_0= 'actor' { enumLiteral_0=(Token)match(input,29,FOLLOW_2); @@ -2379,10 +2645,10 @@ public final Enumerator ruleCategory() throws RecognitionException { } break; case 2 : - // InternalTqcl.g:926:3: (enumLiteral_1= 'parameter' ) + // InternalTqcl.g:1023:3: (enumLiteral_1= 'parameter' ) { - // InternalTqcl.g:926:3: (enumLiteral_1= 'parameter' ) - // InternalTqcl.g:927:4: enumLiteral_1= 'parameter' + // InternalTqcl.g:1023:3: (enumLiteral_1= 'parameter' ) + // InternalTqcl.g:1024:4: enumLiteral_1= 'parameter' { enumLiteral_1=(Token)match(input,30,FOLLOW_2); @@ -2396,10 +2662,10 @@ public final Enumerator ruleCategory() throws RecognitionException { } break; case 3 : - // InternalTqcl.g:934:3: (enumLiteral_2= 'port' ) + // InternalTqcl.g:1031:3: (enumLiteral_2= 'port' ) { - // InternalTqcl.g:934:3: (enumLiteral_2= 'port' ) - // InternalTqcl.g:935:4: enumLiteral_2= 'port' + // InternalTqcl.g:1031:3: (enumLiteral_2= 'port' ) + // InternalTqcl.g:1032:4: enumLiteral_2= 'port' { enumLiteral_2=(Token)match(input,31,FOLLOW_2); @@ -2413,10 +2679,10 @@ public final Enumerator ruleCategory() throws RecognitionException { } break; case 4 : - // InternalTqcl.g:942:3: (enumLiteral_3= 'director' ) + // InternalTqcl.g:1039:3: (enumLiteral_3= 'director' ) { - // InternalTqcl.g:942:3: (enumLiteral_3= 'director' ) - // InternalTqcl.g:943:4: enumLiteral_3= 'director' + // InternalTqcl.g:1039:3: (enumLiteral_3= 'director' ) + // InternalTqcl.g:1040:4: enumLiteral_3= 'director' { enumLiteral_3=(Token)match(input,32,FOLLOW_2); @@ -2457,23 +2723,25 @@ public final Enumerator ruleCategory() throws RecognitionException { public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000B1C002L}); - public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000B14002L}); - public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x00000001E0000040L}); - public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000020000L}); - public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000040002L}); - public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000000090L}); - public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000080002L}); - public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000480000L}); - public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000001000000L}); - public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000000030L}); - public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000002000000L}); - public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000004000000L}); - public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000008000000L}); - public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x000000000131C002L}); + public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000001314002L}); + public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000001314000L}); + public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000001000000L}); + public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x00000001E0000040L}); + public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000040002L}); + public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000000090L}); + public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000080002L}); + public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000480000L}); + public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000000000030L}); + public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000010000000L}); } \ No newline at end of file diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/serializer/AbstractTqclSemanticSequencer.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/serializer/AbstractTqclSemanticSequencer.java index bf5042e7..b62053fa 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/serializer/AbstractTqclSemanticSequencer.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/serializer/AbstractTqclSemanticSequencer.java @@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.triquetrum.commands.services.TqclGrammarAccess; +import org.eclipse.triquetrum.commands.tqcl.CompositeCommand; import org.eclipse.triquetrum.commands.tqcl.Connect; import org.eclipse.triquetrum.commands.tqcl.ConnectionPort; import org.eclipse.triquetrum.commands.tqcl.Go; @@ -47,6 +48,9 @@ public void sequence(ISerializationContext context, EObject semanticObject) { Set parameters = context.getEnabledBooleanParameters(); if (epackage == TqclPackage.eINSTANCE) switch (semanticObject.eClass().getClassifierID()) { + case TqclPackage.COMPOSITE_COMMAND: + sequence_CompositeCommand(context, (CompositeCommand) semanticObject); + return; case TqclPackage.CONNECT: sequence_Connect(context, (Connect) semanticObject); return; @@ -58,10 +62,6 @@ public void sequence(ISerializationContext context, EObject semanticObject) { sequence_GoInto(context, (Go) semanticObject); return; } - else if (rule == grammarAccess.getCommandRule()) { - sequence_GoInto_GoOut_GoTop(context, (Go) semanticObject); - return; - } else if (rule == grammarAccess.getGoOutRule()) { sequence_GoOut(context, (Go) semanticObject); return; @@ -96,6 +96,20 @@ else if (rule == grammarAccess.getGoTopRule()) { /** * Contexts: + * CompositeCommand returns CompositeCommand + * Command returns CompositeCommand + * + * Constraint: + * (start=GoInto commands+=Command (end=GoOut | end=GoTop)) + */ + protected void sequence_CompositeCommand(ISerializationContext context, CompositeCommand semanticObject) { + genericSequencer.createSequence(context, semanticObject); + } + + + /** + * Contexts: + * SimpleCommand returns Connect * Command returns Connect * Connect returns Connect * @@ -133,34 +147,22 @@ protected void sequence_ConnectionPort(ISerializationContext context, Connection * GoInto returns Go * * Constraint: - * (direction='into' obj=NamedObj) + * (direction='into' actor=[Insert|ID]) */ protected void sequence_GoInto(ISerializationContext context, Go semanticObject) { if (errorAcceptor != null) { if (transientValues.isValueTransient(semanticObject, TqclPackage.Literals.GO__DIRECTION) == ValueTransient.YES) errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, TqclPackage.Literals.GO__DIRECTION)); - if (transientValues.isValueTransient(semanticObject, TqclPackage.Literals.GO__OBJ) == ValueTransient.YES) - errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, TqclPackage.Literals.GO__OBJ)); + if (transientValues.isValueTransient(semanticObject, TqclPackage.Literals.GO__ACTOR) == ValueTransient.YES) + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, TqclPackage.Literals.GO__ACTOR)); } SequenceFeeder feeder = createSequencerFeeder(context, semanticObject); feeder.accept(grammarAccess.getGoIntoAccess().getDirectionIntoKeyword_1_0(), semanticObject.getDirection()); - feeder.accept(grammarAccess.getGoIntoAccess().getObjNamedObjParserRuleCall_2_0(), semanticObject.getObj()); + feeder.accept(grammarAccess.getGoIntoAccess().getActorInsertIDTerminalRuleCall_2_0_1(), semanticObject.getActor()); feeder.finish(); } - /** - * Contexts: - * Command returns Go - * - * Constraint: - * ((direction='into' obj=NamedObj) | direction='out' | direction='top') - */ - protected void sequence_GoInto_GoOut_GoTop(ISerializationContext context, Go semanticObject) { - genericSequencer.createSequence(context, semanticObject); - } - - /** * Contexts: * GoOut returns Go @@ -199,6 +201,7 @@ protected void sequence_GoTop(ISerializationContext context, Go semanticObject) /** * Contexts: + * SimpleCommand returns Include * Command returns Include * Include returns Include * @@ -218,6 +221,7 @@ protected void sequence_Include(ISerializationContext context, Include semanticO /** * Contexts: + * SimpleCommand returns Insert * Command returns Insert * Insert returns Insert * @@ -270,6 +274,7 @@ protected void sequence_Parameter(ISerializationContext context, org.eclipse.tri /** * Contexts: + * SimpleCommand returns Set * Command returns Set * Set returns Set * diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/services/TqclGrammarAccess.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/services/TqclGrammarAccess.java index 23f28874..25f0a76a 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/services/TqclGrammarAccess.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/services/TqclGrammarAccess.java @@ -63,27 +63,67 @@ public class TriquetrumScriptElements extends AbstractParserRuleElementFinder { //Command public RuleCall getCommandsCommandParserRuleCall_1_0() { return cCommandsCommandParserRuleCall_1_0; } } - public class CommandElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.Command"); + public class CompositeCommandElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.CompositeCommand"); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Assignment cStartAssignment_0 = (Assignment)cGroup.eContents().get(0); + private final RuleCall cStartGoIntoParserRuleCall_0_0 = (RuleCall)cStartAssignment_0.eContents().get(0); + private final Assignment cCommandsAssignment_1 = (Assignment)cGroup.eContents().get(1); + private final RuleCall cCommandsCommandParserRuleCall_1_0 = (RuleCall)cCommandsAssignment_1.eContents().get(0); + private final Assignment cEndAssignment_2 = (Assignment)cGroup.eContents().get(2); + private final Alternatives cEndAlternatives_2_0 = (Alternatives)cEndAssignment_2.eContents().get(0); + private final RuleCall cEndGoOutParserRuleCall_2_0_0 = (RuleCall)cEndAlternatives_2_0.eContents().get(0); + private final RuleCall cEndGoTopParserRuleCall_2_0_1 = (RuleCall)cEndAlternatives_2_0.eContents().get(1); + + //CompositeCommand: + // start=GoInto commands+=Command end=(GoOut | GoTop); + @Override public ParserRule getRule() { return rule; } + + //start=GoInto commands+=Command end=(GoOut | GoTop) + public Group getGroup() { return cGroup; } + + //start=GoInto + public Assignment getStartAssignment_0() { return cStartAssignment_0; } + + //GoInto + public RuleCall getStartGoIntoParserRuleCall_0_0() { return cStartGoIntoParserRuleCall_0_0; } + + //commands+=Command + public Assignment getCommandsAssignment_1() { return cCommandsAssignment_1; } + + //Command + public RuleCall getCommandsCommandParserRuleCall_1_0() { return cCommandsCommandParserRuleCall_1_0; } + + //end=(GoOut | GoTop) + public Assignment getEndAssignment_2() { return cEndAssignment_2; } + + //(GoOut | GoTop) + public Alternatives getEndAlternatives_2_0() { return cEndAlternatives_2_0; } + + //GoOut + public RuleCall getEndGoOutParserRuleCall_2_0_0() { return cEndGoOutParserRuleCall_2_0_0; } + + //GoTop + public RuleCall getEndGoTopParserRuleCall_2_0_1() { return cEndGoTopParserRuleCall_2_0_1; } + } + public class SimpleCommandElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.SimpleCommand"); private final Group cGroup = (Group)rule.eContents().get(1); private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0); private final RuleCall cInsertParserRuleCall_0_0 = (RuleCall)cAlternatives_0.eContents().get(0); private final RuleCall cConnectParserRuleCall_0_1 = (RuleCall)cAlternatives_0.eContents().get(1); private final RuleCall cSetParserRuleCall_0_2 = (RuleCall)cAlternatives_0.eContents().get(2); - private final RuleCall cGoIntoParserRuleCall_0_3 = (RuleCall)cAlternatives_0.eContents().get(3); - private final RuleCall cGoOutParserRuleCall_0_4 = (RuleCall)cAlternatives_0.eContents().get(4); - private final RuleCall cGoTopParserRuleCall_0_5 = (RuleCall)cAlternatives_0.eContents().get(5); - private final RuleCall cIncludeParserRuleCall_0_6 = (RuleCall)cAlternatives_0.eContents().get(6); + private final RuleCall cIncludeParserRuleCall_0_3 = (RuleCall)cAlternatives_0.eContents().get(3); private final Keyword cSemicolonKeyword_1 = (Keyword)cGroup.eContents().get(1); - //Command: - // (Insert | Connect | Set | GoInto | GoOut | GoTop | Include) ";"; + //SimpleCommand Command: + // (Insert | Connect | Set | Include) ";" @Override public ParserRule getRule() { return rule; } - //(Insert | Connect | Set | GoInto | GoOut | GoTop | Include) ";" + //(Insert | Connect | Set | Include) ";" public Group getGroup() { return cGroup; } - //(Insert | Connect | Set | GoInto | GoOut | GoTop | Include) + //(Insert | Connect | Set | Include) public Alternatives getAlternatives_0() { return cAlternatives_0; } //Insert @@ -95,21 +135,31 @@ public class CommandElements extends AbstractParserRuleElementFinder { //Set public RuleCall getSetParserRuleCall_0_2() { return cSetParserRuleCall_0_2; } - //GoInto - public RuleCall getGoIntoParserRuleCall_0_3() { return cGoIntoParserRuleCall_0_3; } - - //GoOut - public RuleCall getGoOutParserRuleCall_0_4() { return cGoOutParserRuleCall_0_4; } - - //GoTop - public RuleCall getGoTopParserRuleCall_0_5() { return cGoTopParserRuleCall_0_5; } - //Include - public RuleCall getIncludeParserRuleCall_0_6() { return cIncludeParserRuleCall_0_6; } + public RuleCall getIncludeParserRuleCall_0_3() { return cIncludeParserRuleCall_0_3; } //";" public Keyword getSemicolonKeyword_1() { return cSemicolonKeyword_1; } } + public class CommandElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.Command"); + private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); + private final RuleCall cSimpleCommandParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); + private final RuleCall cCompositeCommandParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); + + //Command: + // SimpleCommand | CompositeCommand; + @Override public ParserRule getRule() { return rule; } + + //SimpleCommand | CompositeCommand + public Alternatives getAlternatives() { return cAlternatives; } + + //SimpleCommand + public RuleCall getSimpleCommandParserRuleCall_0() { return cSimpleCommandParserRuleCall_0; } + + //CompositeCommand + public RuleCall getCompositeCommandParserRuleCall_1() { return cCompositeCommandParserRuleCall_1; } + } public class IncludeElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.Include"); private final Group cGroup = (Group)rule.eContents().get(1); @@ -331,20 +381,56 @@ public class ConnectElements extends AbstractParserRuleElementFinder { //ConnectionPort public RuleCall getToConnectionPortParserRuleCall_5_1_0() { return cToConnectionPortParserRuleCall_5_1_0; } } + public class ConnectionPortElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Assignment cActorAssignment_0 = (Assignment)cGroup.eContents().get(0); + private final CrossReference cActorInsertCrossReference_0_0 = (CrossReference)cActorAssignment_0.eContents().get(0); + private final RuleCall cActorInsertIDTerminalRuleCall_0_0_1 = (RuleCall)cActorInsertCrossReference_0_0.eContents().get(1); + private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); + private final Assignment cPortAssignment_2 = (Assignment)cGroup.eContents().get(2); + private final RuleCall cPortNamedObjParserRuleCall_2_0 = (RuleCall)cPortAssignment_2.eContents().get(0); + + //ConnectionPort: + // actor=[Insert] '.' port=NamedObj; + @Override public ParserRule getRule() { return rule; } + + //actor=[Insert] '.' port=NamedObj + public Group getGroup() { return cGroup; } + + //actor=[Insert] + public Assignment getActorAssignment_0() { return cActorAssignment_0; } + + //[Insert] + public CrossReference getActorInsertCrossReference_0_0() { return cActorInsertCrossReference_0_0; } + + //ID + public RuleCall getActorInsertIDTerminalRuleCall_0_0_1() { return cActorInsertIDTerminalRuleCall_0_0_1; } + + //'.' + public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } + + //port=NamedObj + public Assignment getPortAssignment_2() { return cPortAssignment_2; } + + //NamedObj + public RuleCall getPortNamedObjParserRuleCall_2_0() { return cPortNamedObjParserRuleCall_2_0; } + } public class GoIntoElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.GoInto"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword cGoKeyword_0 = (Keyword)cGroup.eContents().get(0); private final Assignment cDirectionAssignment_1 = (Assignment)cGroup.eContents().get(1); private final Keyword cDirectionIntoKeyword_1_0 = (Keyword)cDirectionAssignment_1.eContents().get(0); - private final Assignment cObjAssignment_2 = (Assignment)cGroup.eContents().get(2); - private final RuleCall cObjNamedObjParserRuleCall_2_0 = (RuleCall)cObjAssignment_2.eContents().get(0); + private final Assignment cActorAssignment_2 = (Assignment)cGroup.eContents().get(2); + private final CrossReference cActorInsertCrossReference_2_0 = (CrossReference)cActorAssignment_2.eContents().get(0); + private final RuleCall cActorInsertIDTerminalRuleCall_2_0_1 = (RuleCall)cActorInsertCrossReference_2_0.eContents().get(1); //GoInto Go: - // "go" direction="into" obj=NamedObj + // "go" direction="into" actor=[Insert] @Override public ParserRule getRule() { return rule; } - //"go" direction="into" obj=NamedObj + //"go" direction="into" actor=[Insert] public Group getGroup() { return cGroup; } //"go" @@ -356,11 +442,14 @@ public class GoIntoElements extends AbstractParserRuleElementFinder { //"into" public Keyword getDirectionIntoKeyword_1_0() { return cDirectionIntoKeyword_1_0; } - //obj=NamedObj - public Assignment getObjAssignment_2() { return cObjAssignment_2; } + //actor=[Insert] + public Assignment getActorAssignment_2() { return cActorAssignment_2; } - //NamedObj - public RuleCall getObjNamedObjParserRuleCall_2_0() { return cObjNamedObjParserRuleCall_2_0; } + //[Insert] + public CrossReference getActorInsertCrossReference_2_0() { return cActorInsertCrossReference_2_0; } + + //ID + public RuleCall getActorInsertIDTerminalRuleCall_2_0_1() { return cActorInsertIDTerminalRuleCall_2_0_1; } } public class GoOutElements extends AbstractParserRuleElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.GoOut"); @@ -477,44 +566,6 @@ public class NamedObjElements extends AbstractParserRuleElementFinder { //STRING public RuleCall getSTRINGTerminalRuleCall_1() { return cSTRINGTerminalRuleCall_1; } } - public class ConnectionPortElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.ConnectionPort"); - private final Group cGroup = (Group)rule.eContents().get(1); - private final Assignment cActorAssignment_0 = (Assignment)cGroup.eContents().get(0); - private final CrossReference cActorInsertCrossReference_0_0 = (CrossReference)cActorAssignment_0.eContents().get(0); - private final RuleCall cActorInsertIDTerminalRuleCall_0_0_1 = (RuleCall)cActorInsertCrossReference_0_0.eContents().get(1); - private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1); - private final Assignment cPortAssignment_2 = (Assignment)cGroup.eContents().get(2); - private final RuleCall cPortNamedObjParserRuleCall_2_0 = (RuleCall)cPortAssignment_2.eContents().get(0); - - ////terminal fragment ESCAPED_CHAR: - //// '\\' ('n'|'t'|'r'|'\\'); - ////terminal ENTITY_INSTANCE_NAME: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|ESCAPED_CHAR)*; - //ConnectionPort: - // actor=[Insert] '.' port=NamedObj; - @Override public ParserRule getRule() { return rule; } - - //actor=[Insert] '.' port=NamedObj - public Group getGroup() { return cGroup; } - - //actor=[Insert] - public Assignment getActorAssignment_0() { return cActorAssignment_0; } - - //[Insert] - public CrossReference getActorInsertCrossReference_0_0() { return cActorInsertCrossReference_0_0; } - - //ID - public RuleCall getActorInsertIDTerminalRuleCall_0_0_1() { return cActorInsertIDTerminalRuleCall_0_0_1; } - - //'.' - public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; } - - //port=NamedObj - public Assignment getPortAssignment_2() { return cPortAssignment_2; } - - //NamedObj - public RuleCall getPortNamedObjParserRuleCall_2_0() { return cPortNamedObjParserRuleCall_2_0; } - } public class CategoryElements extends AbstractEnumRuleElementFinder { private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.Category"); @@ -561,12 +612,15 @@ public class CategoryElements extends AbstractEnumRuleElementFinder { } private final TriquetrumScriptElements pTriquetrumScript; + private final CompositeCommandElements pCompositeCommand; + private final SimpleCommandElements pSimpleCommand; private final CommandElements pCommand; private final IncludeElements pInclude; private final LibraryElements pLibrary; private final InsertElements pInsert; private final SetElements pSet; private final ConnectElements pConnect; + private final ConnectionPortElements pConnectionPort; private final GoIntoElements pGoInto; private final GoOutElements pGoOut; private final GoTopElements pGoTop; @@ -576,7 +630,6 @@ public class CategoryElements extends AbstractEnumRuleElementFinder { private final TerminalRule tPARAMETER_NAME; private final NamedObjElements pNamedObj; private final TerminalRule tENTITY_CLASS; - private final ConnectionPortElements pConnectionPort; private final Grammar grammar; @@ -588,12 +641,15 @@ public TqclGrammarAccess(GrammarProvider grammarProvider, this.grammar = internalFindGrammar(grammarProvider); this.gaTerminals = gaTerminals; this.pTriquetrumScript = new TriquetrumScriptElements(); + this.pCompositeCommand = new CompositeCommandElements(); + this.pSimpleCommand = new SimpleCommandElements(); this.pCommand = new CommandElements(); this.pInclude = new IncludeElements(); this.pLibrary = new LibraryElements(); this.pInsert = new InsertElements(); this.pSet = new SetElements(); this.pConnect = new ConnectElements(); + this.pConnectionPort = new ConnectionPortElements(); this.pGoInto = new GoIntoElements(); this.pGoOut = new GoOutElements(); this.pGoTop = new GoTopElements(); @@ -603,7 +659,6 @@ public TqclGrammarAccess(GrammarProvider grammarProvider, this.tPARAMETER_NAME = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.PARAMETER_NAME"); this.pNamedObj = new NamedObjElements(); this.tENTITY_CLASS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.triquetrum.commands.Tqcl.ENTITY_CLASS"); - this.pConnectionPort = new ConnectionPortElements(); } protected Grammar internalFindGrammar(GrammarProvider grammarProvider) { @@ -644,8 +699,28 @@ public ParserRule getTriquetrumScriptRule() { return getTriquetrumScriptAccess().getRule(); } + //CompositeCommand: + // start=GoInto commands+=Command end=(GoOut | GoTop); + public CompositeCommandElements getCompositeCommandAccess() { + return pCompositeCommand; + } + + public ParserRule getCompositeCommandRule() { + return getCompositeCommandAccess().getRule(); + } + + //SimpleCommand Command: + // (Insert | Connect | Set | Include) ";" + public SimpleCommandElements getSimpleCommandAccess() { + return pSimpleCommand; + } + + public ParserRule getSimpleCommandRule() { + return getSimpleCommandAccess().getRule(); + } + //Command: - // (Insert | Connect | Set | GoInto | GoOut | GoTop | Include) ";"; + // SimpleCommand | CompositeCommand; public CommandElements getCommandAccess() { return pCommand; } @@ -705,8 +780,18 @@ public ParserRule getConnectRule() { return getConnectAccess().getRule(); } + //ConnectionPort: + // actor=[Insert] '.' port=NamedObj; + public ConnectionPortElements getConnectionPortAccess() { + return pConnectionPort; + } + + public ParserRule getConnectionPortRule() { + return getConnectionPortAccess().getRule(); + } + //GoInto Go: - // "go" direction="into" obj=NamedObj + // "go" direction="into" actor=[Insert] public GoIntoElements getGoIntoAccess() { return pGoInto; } @@ -787,19 +872,6 @@ public TerminalRule getENTITY_CLASSRule() { return tENTITY_CLASS; } - ////terminal fragment ESCAPED_CHAR: - //// '\\' ('n'|'t'|'r'|'\\'); - ////terminal ENTITY_INSTANCE_NAME: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|ESCAPED_CHAR)*; - //ConnectionPort: - // actor=[Insert] '.' port=NamedObj; - public ConnectionPortElements getConnectionPortAccess() { - return pConnectionPort; - } - - public ParserRule getConnectionPortRule() { - return getConnectionPortAccess().getRule(); - } - //terminal ID: // '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*; public TerminalRule getIDRule() { diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/CompositeCommand.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/CompositeCommand.java new file mode 100644 index 00000000..ee997a2d --- /dev/null +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/CompositeCommand.java @@ -0,0 +1,107 @@ +/** + * ****************************************************************************** + * Copyright (c) 2016 Totaro Rodolfo + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * generated by Xtext 2.10.0 + * * + * Contributors: + * Rodolfo Totaro - initial API and implementation and/or initial documentation + * ****************************************************************************** + */ +package org.eclipse.triquetrum.commands.tqcl; + +import org.eclipse.emf.common.util.EList; + +/** + * + * A representation of the model object 'Composite Command'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getStart Start}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getCommands Commands}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getEnd End}
    • + *
+ * + * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getCompositeCommand() + * @model + * @generated + */ +public interface CompositeCommand extends Command +{ + /** + * Returns the value of the 'Start' containment reference. + * + *

+ * If the meaning of the 'Start' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Start' containment reference. + * @see #setStart(Go) + * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getCompositeCommand_Start() + * @model containment="true" + * @generated + */ + Go getStart(); + + /** + * Sets the value of the '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getStart Start}' containment reference. + * + * + * @param value the new value of the 'Start' containment reference. + * @see #getStart() + * @generated + */ + void setStart(Go value); + + /** + * Returns the value of the 'Commands' containment reference list. + * The list contents are of type {@link org.eclipse.triquetrum.commands.tqcl.Command}. + * + *

+ * If the meaning of the 'Commands' containment reference list isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Commands' containment reference list. + * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getCompositeCommand_Commands() + * @model containment="true" + * @generated + */ + EList getCommands(); + + /** + * Returns the value of the 'End' containment reference. + * + *

+ * If the meaning of the 'End' containment reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'End' containment reference. + * @see #setEnd(Go) + * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getCompositeCommand_End() + * @model containment="true" + * @generated + */ + Go getEnd(); + + /** + * Sets the value of the '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getEnd End}' containment reference. + * + * + * @param value the new value of the 'End' containment reference. + * @see #getEnd() + * @generated + */ + void setEnd(Go value); + +} // CompositeCommand diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/Go.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/Go.java index d1c4f248..a9180113 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/Go.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/Go.java @@ -14,6 +14,7 @@ */ package org.eclipse.triquetrum.commands.tqcl; +import org.eclipse.emf.ecore.EObject; /** * @@ -25,14 +26,14 @@ *

*
    *
  • {@link org.eclipse.triquetrum.commands.tqcl.Go#getDirection Direction}
    • - *
  • {@link org.eclipse.triquetrum.commands.tqcl.Go#getObj Obj}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.Go#getActor Actor}
    • *
* * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getGo() * @model * @generated */ -public interface Go extends Command +public interface Go extends EObject { /** * Returns the value of the 'Direction' attribute. @@ -61,29 +62,29 @@ public interface Go extends Command void setDirection(String value); /** - * Returns the value of the 'Obj' attribute. + * Returns the value of the 'Actor' reference. * *

- * If the meaning of the 'Obj' attribute isn't clear, + * If the meaning of the 'Actor' reference isn't clear, * there really should be more of a description here... *

* - * @return the value of the 'Obj' attribute. - * @see #setObj(String) - * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getGo_Obj() + * @return the value of the 'Actor' reference. + * @see #setActor(Insert) + * @see org.eclipse.triquetrum.commands.tqcl.TqclPackage#getGo_Actor() * @model * @generated */ - String getObj(); + Insert getActor(); /** - * Sets the value of the '{@link org.eclipse.triquetrum.commands.tqcl.Go#getObj Obj}' attribute. + * Sets the value of the '{@link org.eclipse.triquetrum.commands.tqcl.Go#getActor Actor}' reference. * * - * @param value the new value of the 'Obj' attribute. - * @see #getObj() + * @param value the new value of the 'Actor' reference. + * @see #getActor() * @generated */ - void setObj(String value); + void setActor(Insert value); } // Go diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclFactory.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclFactory.java index 0bb368d9..35cbae8d 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclFactory.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclFactory.java @@ -43,6 +43,15 @@ public interface TqclFactory extends EFactory */ TriquetrumScript createTriquetrumScript(); + /** + * Returns a new object of class 'Composite Command'. + * + * + * @return a new object of class 'Composite Command'. + * @generated + */ + CompositeCommand createCompositeCommand(); + /** * Returns a new object of class 'Command'. * @@ -98,31 +107,31 @@ public interface TqclFactory extends EFactory Connect createConnect(); /** - * Returns a new object of class 'Go'. + * Returns a new object of class 'Connection Port'. * * - * @return a new object of class 'Go'. + * @return a new object of class 'Connection Port'. * @generated */ - Go createGo(); + ConnectionPort createConnectionPort(); /** - * Returns a new object of class 'Parameter'. + * Returns a new object of class 'Go'. * * - * @return a new object of class 'Parameter'. + * @return a new object of class 'Go'. * @generated */ - Parameter createParameter(); + Go createGo(); /** - * Returns a new object of class 'Connection Port'. + * Returns a new object of class 'Parameter'. * * - * @return a new object of class 'Connection Port'. + * @return a new object of class 'Parameter'. * @generated */ - ConnectionPort createConnectionPort(); + Parameter createParameter(); /** * Returns the package supported by this factory. diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclPackage.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclPackage.java index 18421a41..09595662 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclPackage.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/TqclPackage.java @@ -114,7 +114,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getCommand() * @generated */ - int COMMAND = 1; + int COMMAND = 2; /** * The number of structural features of the 'Command' class. @@ -125,6 +125,52 @@ public interface TqclPackage extends EPackage */ int COMMAND_FEATURE_COUNT = 0; + /** + * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl Composite Command}' class. + * + * + * @see org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getCompositeCommand() + * @generated + */ + int COMPOSITE_COMMAND = 1; + + /** + * The feature id for the 'Start' containment reference. + * + * + * @generated + * @ordered + */ + int COMPOSITE_COMMAND__START = COMMAND_FEATURE_COUNT + 0; + + /** + * The feature id for the 'Commands' containment reference list. + * + * + * @generated + * @ordered + */ + int COMPOSITE_COMMAND__COMMANDS = COMMAND_FEATURE_COUNT + 1; + + /** + * The feature id for the 'End' containment reference. + * + * + * @generated + * @ordered + */ + int COMPOSITE_COMMAND__END = COMMAND_FEATURE_COUNT + 2; + + /** + * The number of structural features of the 'Composite Command' class. + * + * + * @generated + * @ordered + */ + int COMPOSITE_COMMAND_FEATURE_COUNT = COMMAND_FEATURE_COUNT + 3; + /** * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.IncludeImpl Include}' class. * @@ -133,7 +179,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getInclude() * @generated */ - int INCLUDE = 2; + int INCLUDE = 3; /** * The feature id for the 'Filename' attribute. @@ -161,7 +207,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getLibrary() * @generated */ - int LIBRARY = 3; + int LIBRARY = 4; /** * The feature id for the 'Name' attribute. @@ -189,7 +235,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getInsert() * @generated */ - int INSERT = 4; + int INSERT = 5; /** * The feature id for the 'Category' attribute. @@ -244,7 +290,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getSet() * @generated */ - int SET = 5; + int SET = 6; /** * The feature id for the 'Param' containment reference. @@ -272,7 +318,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getConnect() * @generated */ - int CONNECT = 6; + int CONNECT = 7; /** * The feature id for the 'From' containment reference list. @@ -302,115 +348,115 @@ public interface TqclPackage extends EPackage int CONNECT_FEATURE_COUNT = COMMAND_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl Go}' class. + * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl Connection Port}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.GoImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getGo() + * @see org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getConnectionPort() * @generated */ - int GO = 7; + int CONNECTION_PORT = 8; /** - * The feature id for the 'Direction' attribute. + * The feature id for the 'Actor' reference. * * * @generated * @ordered */ - int GO__DIRECTION = COMMAND_FEATURE_COUNT + 0; + int CONNECTION_PORT__ACTOR = 0; /** - * The feature id for the 'Obj' attribute. + * The feature id for the 'Port' attribute. * * * @generated * @ordered */ - int GO__OBJ = COMMAND_FEATURE_COUNT + 1; + int CONNECTION_PORT__PORT = 1; /** - * The number of structural features of the 'Go' class. + * The number of structural features of the 'Connection Port' class. * * * @generated * @ordered */ - int GO_FEATURE_COUNT = COMMAND_FEATURE_COUNT + 2; + int CONNECTION_PORT_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl Parameter}' class. + * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl Go}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getParameter() + * @see org.eclipse.triquetrum.commands.tqcl.impl.GoImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getGo() * @generated */ - int PARAMETER = 8; + int GO = 9; /** - * The feature id for the 'Id' attribute. + * The feature id for the 'Direction' attribute. * * * @generated * @ordered */ - int PARAMETER__ID = 0; + int GO__DIRECTION = 0; /** - * The feature id for the 'Value' attribute. + * The feature id for the 'Actor' reference. * * * @generated * @ordered */ - int PARAMETER__VALUE = 1; + int GO__ACTOR = 1; /** - * The number of structural features of the 'Parameter' class. + * The number of structural features of the 'Go' class. * * * @generated * @ordered */ - int PARAMETER_FEATURE_COUNT = 2; + int GO_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl Connection Port}' class. + * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl Parameter}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getConnectionPort() + * @see org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getParameter() * @generated */ - int CONNECTION_PORT = 9; + int PARAMETER = 10; /** - * The feature id for the 'Actor' reference. + * The feature id for the 'Id' attribute. * * * @generated * @ordered */ - int CONNECTION_PORT__ACTOR = 0; + int PARAMETER__ID = 0; /** - * The feature id for the 'Port' attribute. + * The feature id for the 'Value' attribute. * * * @generated * @ordered */ - int CONNECTION_PORT__PORT = 1; + int PARAMETER__VALUE = 1; /** - * The number of structural features of the 'Connection Port' class. + * The number of structural features of the 'Parameter' class. * * * @generated * @ordered */ - int CONNECTION_PORT_FEATURE_COUNT = 2; + int PARAMETER_FEATURE_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.triquetrum.commands.tqcl.Category Category}' enum. @@ -420,7 +466,7 @@ public interface TqclPackage extends EPackage * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getCategory() * @generated */ - int CATEGORY = 10; + int CATEGORY = 11; /** @@ -455,6 +501,49 @@ public interface TqclPackage extends EPackage */ EReference getTriquetrumScript_Commands(); + /** + * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand Composite Command}'. + * + * + * @return the meta object for class 'Composite Command'. + * @see org.eclipse.triquetrum.commands.tqcl.CompositeCommand + * @generated + */ + EClass getCompositeCommand(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getStart Start}'. + * + * + * @return the meta object for the containment reference 'Start'. + * @see org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getStart() + * @see #getCompositeCommand() + * @generated + */ + EReference getCompositeCommand_Start(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getCommands Commands}'. + * + * + * @return the meta object for the containment reference list 'Commands'. + * @see org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getCommands() + * @see #getCompositeCommand() + * @generated + */ + EReference getCompositeCommand_Commands(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getEnd End}'. + * + * + * @return the meta object for the containment reference 'End'. + * @see org.eclipse.triquetrum.commands.tqcl.CompositeCommand#getEnd() + * @see #getCompositeCommand() + * @generated + */ + EReference getCompositeCommand_End(); + /** * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.Command Command}'. * @@ -614,6 +703,38 @@ public interface TqclPackage extends EPackage */ EReference getConnect_To(); + /** + * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort Connection Port}'. + * + * + * @return the meta object for class 'Connection Port'. + * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort + * @generated + */ + EClass getConnectionPort(); + + /** + * Returns the meta object for the reference '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getActor Actor}'. + * + * + * @return the meta object for the reference 'Actor'. + * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getActor() + * @see #getConnectionPort() + * @generated + */ + EReference getConnectionPort_Actor(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getPort Port}'. + * + * + * @return the meta object for the attribute 'Port'. + * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getPort() + * @see #getConnectionPort() + * @generated + */ + EAttribute getConnectionPort_Port(); + /** * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.Go Go}'. * @@ -636,15 +757,15 @@ public interface TqclPackage extends EPackage EAttribute getGo_Direction(); /** - * Returns the meta object for the attribute '{@link org.eclipse.triquetrum.commands.tqcl.Go#getObj Obj}'. + * Returns the meta object for the reference '{@link org.eclipse.triquetrum.commands.tqcl.Go#getActor Actor}'. * * - * @return the meta object for the attribute 'Obj'. - * @see org.eclipse.triquetrum.commands.tqcl.Go#getObj() + * @return the meta object for the reference 'Actor'. + * @see org.eclipse.triquetrum.commands.tqcl.Go#getActor() * @see #getGo() * @generated */ - EAttribute getGo_Obj(); + EReference getGo_Actor(); /** * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.Parameter Parameter}'. @@ -678,38 +799,6 @@ public interface TqclPackage extends EPackage */ EAttribute getParameter_Value(); - /** - * Returns the meta object for class '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort Connection Port}'. - * - * - * @return the meta object for class 'Connection Port'. - * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort - * @generated - */ - EClass getConnectionPort(); - - /** - * Returns the meta object for the reference '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getActor Actor}'. - * - * - * @return the meta object for the reference 'Actor'. - * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getActor() - * @see #getConnectionPort() - * @generated - */ - EReference getConnectionPort_Actor(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getPort Port}'. - * - * - * @return the meta object for the attribute 'Port'. - * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort#getPort() - * @see #getConnectionPort() - * @generated - */ - EAttribute getConnectionPort_Port(); - /** * Returns the meta object for enum '{@link org.eclipse.triquetrum.commands.tqcl.Category Category}'. * @@ -769,6 +858,40 @@ interface Literals */ EReference TRIQUETRUM_SCRIPT__COMMANDS = eINSTANCE.getTriquetrumScript_Commands(); + /** + * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl Composite Command}' class. + * + * + * @see org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getCompositeCommand() + * @generated + */ + EClass COMPOSITE_COMMAND = eINSTANCE.getCompositeCommand(); + + /** + * The meta object literal for the 'Start' containment reference feature. + * + * + * @generated + */ + EReference COMPOSITE_COMMAND__START = eINSTANCE.getCompositeCommand_Start(); + + /** + * The meta object literal for the 'Commands' containment reference list feature. + * + * + * @generated + */ + EReference COMPOSITE_COMMAND__COMMANDS = eINSTANCE.getCompositeCommand_Commands(); + + /** + * The meta object literal for the 'End' containment reference feature. + * + * + * @generated + */ + EReference COMPOSITE_COMMAND__END = eINSTANCE.getCompositeCommand_End(); + /** * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.CommandImpl Command}' class. * @@ -902,82 +1025,82 @@ interface Literals EReference CONNECT__TO = eINSTANCE.getConnect_To(); /** - * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl Go}' class. + * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl Connection Port}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.GoImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getGo() + * @see org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getConnectionPort() * @generated */ - EClass GO = eINSTANCE.getGo(); + EClass CONNECTION_PORT = eINSTANCE.getConnectionPort(); /** - * The meta object literal for the 'Direction' attribute feature. + * The meta object literal for the 'Actor' reference feature. * * * @generated */ - EAttribute GO__DIRECTION = eINSTANCE.getGo_Direction(); + EReference CONNECTION_PORT__ACTOR = eINSTANCE.getConnectionPort_Actor(); /** - * The meta object literal for the 'Obj' attribute feature. + * The meta object literal for the 'Port' attribute feature. * * * @generated */ - EAttribute GO__OBJ = eINSTANCE.getGo_Obj(); + EAttribute CONNECTION_PORT__PORT = eINSTANCE.getConnectionPort_Port(); /** - * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl Parameter}' class. + * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl Go}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getParameter() + * @see org.eclipse.triquetrum.commands.tqcl.impl.GoImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getGo() * @generated */ - EClass PARAMETER = eINSTANCE.getParameter(); + EClass GO = eINSTANCE.getGo(); /** - * The meta object literal for the 'Id' attribute feature. + * The meta object literal for the 'Direction' attribute feature. * * * @generated */ - EAttribute PARAMETER__ID = eINSTANCE.getParameter_Id(); + EAttribute GO__DIRECTION = eINSTANCE.getGo_Direction(); /** - * The meta object literal for the 'Value' attribute feature. + * The meta object literal for the 'Actor' reference feature. * * * @generated */ - EAttribute PARAMETER__VALUE = eINSTANCE.getParameter_Value(); + EReference GO__ACTOR = eINSTANCE.getGo_Actor(); /** - * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl Connection Port}' class. + * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl Parameter}' class. * * - * @see org.eclipse.triquetrum.commands.tqcl.impl.ConnectionPortImpl - * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getConnectionPort() + * @see org.eclipse.triquetrum.commands.tqcl.impl.ParameterImpl + * @see org.eclipse.triquetrum.commands.tqcl.impl.TqclPackageImpl#getParameter() * @generated */ - EClass CONNECTION_PORT = eINSTANCE.getConnectionPort(); + EClass PARAMETER = eINSTANCE.getParameter(); /** - * The meta object literal for the 'Actor' reference feature. + * The meta object literal for the 'Id' attribute feature. * * * @generated */ - EReference CONNECTION_PORT__ACTOR = eINSTANCE.getConnectionPort_Actor(); + EAttribute PARAMETER__ID = eINSTANCE.getParameter_Id(); /** - * The meta object literal for the 'Port' attribute feature. + * The meta object literal for the 'Value' attribute feature. * * * @generated */ - EAttribute CONNECTION_PORT__PORT = eINSTANCE.getConnectionPort_Port(); + EAttribute PARAMETER__VALUE = eINSTANCE.getParameter_Value(); /** * The meta object literal for the '{@link org.eclipse.triquetrum.commands.tqcl.Category Category}' enum. diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/CompositeCommandImpl.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/CompositeCommandImpl.java new file mode 100644 index 00000000..e26fa36a --- /dev/null +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/CompositeCommandImpl.java @@ -0,0 +1,323 @@ +/** + * ****************************************************************************** + * Copyright (c) 2016 Totaro Rodolfo + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * generated by Xtext 2.10.0 + * * + * Contributors: + * Rodolfo Totaro - initial API and implementation and/or initial documentation + * ****************************************************************************** + */ +package org.eclipse.triquetrum.commands.tqcl.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.triquetrum.commands.tqcl.Command; +import org.eclipse.triquetrum.commands.tqcl.CompositeCommand; +import org.eclipse.triquetrum.commands.tqcl.Go; +import org.eclipse.triquetrum.commands.tqcl.TqclPackage; + +/** + * + * An implementation of the model object 'Composite Command'. + * + *

+ * The following features are implemented: + *

+ *
    + *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl#getStart Start}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl#getCommands Commands}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.CompositeCommandImpl#getEnd End}
    • + *
+ * + * @generated + */ +public class CompositeCommandImpl extends CommandImpl implements CompositeCommand +{ + /** + * The cached value of the '{@link #getStart() Start}' containment reference. + * + * + * @see #getStart() + * @generated + * @ordered + */ + protected Go start; + + /** + * The cached value of the '{@link #getCommands() Commands}' containment reference list. + * + * + * @see #getCommands() + * @generated + * @ordered + */ + protected EList commands; + + /** + * The cached value of the '{@link #getEnd() End}' containment reference. + * + * + * @see #getEnd() + * @generated + * @ordered + */ + protected Go end; + + /** + * + * + * @generated + */ + protected CompositeCommandImpl() + { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return TqclPackage.Literals.COMPOSITE_COMMAND; + } + + /** + * + * + * @generated + */ + public Go getStart() + { + return start; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetStart(Go newStart, NotificationChain msgs) + { + Go oldStart = start; + start = newStart; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TqclPackage.COMPOSITE_COMMAND__START, oldStart, newStart); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setStart(Go newStart) + { + if (newStart != start) + { + NotificationChain msgs = null; + if (start != null) + msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TqclPackage.COMPOSITE_COMMAND__START, null, msgs); + if (newStart != null) + msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TqclPackage.COMPOSITE_COMMAND__START, null, msgs); + msgs = basicSetStart(newStart, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TqclPackage.COMPOSITE_COMMAND__START, newStart, newStart)); + } + + /** + * + * + * @generated + */ + public EList getCommands() + { + if (commands == null) + { + commands = new EObjectContainmentEList(Command.class, this, TqclPackage.COMPOSITE_COMMAND__COMMANDS); + } + return commands; + } + + /** + * + * + * @generated + */ + public Go getEnd() + { + return end; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEnd(Go newEnd, NotificationChain msgs) + { + Go oldEnd = end; + end = newEnd; + if (eNotificationRequired()) + { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TqclPackage.COMPOSITE_COMMAND__END, oldEnd, newEnd); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEnd(Go newEnd) + { + if (newEnd != end) + { + NotificationChain msgs = null; + if (end != null) + msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TqclPackage.COMPOSITE_COMMAND__END, null, msgs); + if (newEnd != null) + msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TqclPackage.COMPOSITE_COMMAND__END, null, msgs); + msgs = basicSetEnd(newEnd, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, TqclPackage.COMPOSITE_COMMAND__END, newEnd, newEnd)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) + { + switch (featureID) + { + case TqclPackage.COMPOSITE_COMMAND__START: + return basicSetStart(null, msgs); + case TqclPackage.COMPOSITE_COMMAND__COMMANDS: + return ((InternalEList)getCommands()).basicRemove(otherEnd, msgs); + case TqclPackage.COMPOSITE_COMMAND__END: + return basicSetEnd(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case TqclPackage.COMPOSITE_COMMAND__START: + return getStart(); + case TqclPackage.COMPOSITE_COMMAND__COMMANDS: + return getCommands(); + case TqclPackage.COMPOSITE_COMMAND__END: + return getEnd(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) + { + switch (featureID) + { + case TqclPackage.COMPOSITE_COMMAND__START: + setStart((Go)newValue); + return; + case TqclPackage.COMPOSITE_COMMAND__COMMANDS: + getCommands().clear(); + getCommands().addAll((Collection)newValue); + return; + case TqclPackage.COMPOSITE_COMMAND__END: + setEnd((Go)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) + { + switch (featureID) + { + case TqclPackage.COMPOSITE_COMMAND__START: + setStart((Go)null); + return; + case TqclPackage.COMPOSITE_COMMAND__COMMANDS: + getCommands().clear(); + return; + case TqclPackage.COMPOSITE_COMMAND__END: + setEnd((Go)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case TqclPackage.COMPOSITE_COMMAND__START: + return start != null; + case TqclPackage.COMPOSITE_COMMAND__COMMANDS: + return commands != null && !commands.isEmpty(); + case TqclPackage.COMPOSITE_COMMAND__END: + return end != null; + } + return super.eIsSet(featureID); + } + +} //CompositeCommandImpl diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/GoImpl.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/GoImpl.java index 6577244f..b98c7696 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/GoImpl.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/GoImpl.java @@ -17,10 +17,13 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.triquetrum.commands.tqcl.Go; +import org.eclipse.triquetrum.commands.tqcl.Insert; import org.eclipse.triquetrum.commands.tqcl.TqclPackage; /** @@ -32,12 +35,12 @@ *

*
    *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl#getDirection Direction}
    • - *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl#getObj Obj}
    • + *
  • {@link org.eclipse.triquetrum.commands.tqcl.impl.GoImpl#getActor Actor}
    • *
* * @generated */ -public class GoImpl extends CommandImpl implements Go +public class GoImpl extends MinimalEObjectImpl.Container implements Go { /** * The default value of the '{@link #getDirection() Direction}' attribute. @@ -60,24 +63,14 @@ public class GoImpl extends CommandImpl implements Go protected String direction = DIRECTION_EDEFAULT; /** - * The default value of the '{@link #getObj() Obj}' attribute. + * The cached value of the '{@link #getActor() Actor}' reference. * * - * @see #getObj() + * @see #getActor() * @generated * @ordered */ - protected static final String OBJ_EDEFAULT = null; - - /** - * The cached value of the '{@link #getObj() Obj}' attribute. - * - * - * @see #getObj() - * @generated - * @ordered - */ - protected String obj = OBJ_EDEFAULT; + protected Insert actor; /** * @@ -128,9 +121,29 @@ public void setDirection(String newDirection) * * @generated */ - public String getObj() + public Insert getActor() + { + if (actor != null && actor.eIsProxy()) + { + InternalEObject oldActor = (InternalEObject)actor; + actor = (Insert)eResolveProxy(oldActor); + if (actor != oldActor) + { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, TqclPackage.GO__ACTOR, oldActor, actor)); + } + } + return actor; + } + + /** + * + * + * @generated + */ + public Insert basicGetActor() { - return obj; + return actor; } /** @@ -138,12 +151,12 @@ public String getObj() * * @generated */ - public void setObj(String newObj) + public void setActor(Insert newActor) { - String oldObj = obj; - obj = newObj; + Insert oldActor = actor; + actor = newActor; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TqclPackage.GO__OBJ, oldObj, obj)); + eNotify(new ENotificationImpl(this, Notification.SET, TqclPackage.GO__ACTOR, oldActor, actor)); } /** @@ -158,8 +171,9 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { case TqclPackage.GO__DIRECTION: return getDirection(); - case TqclPackage.GO__OBJ: - return getObj(); + case TqclPackage.GO__ACTOR: + if (resolve) return getActor(); + return basicGetActor(); } return super.eGet(featureID, resolve, coreType); } @@ -177,8 +191,8 @@ public void eSet(int featureID, Object newValue) case TqclPackage.GO__DIRECTION: setDirection((String)newValue); return; - case TqclPackage.GO__OBJ: - setObj((String)newValue); + case TqclPackage.GO__ACTOR: + setActor((Insert)newValue); return; } super.eSet(featureID, newValue); @@ -197,8 +211,8 @@ public void eUnset(int featureID) case TqclPackage.GO__DIRECTION: setDirection(DIRECTION_EDEFAULT); return; - case TqclPackage.GO__OBJ: - setObj(OBJ_EDEFAULT); + case TqclPackage.GO__ACTOR: + setActor((Insert)null); return; } super.eUnset(featureID); @@ -216,8 +230,8 @@ public boolean eIsSet(int featureID) { case TqclPackage.GO__DIRECTION: return DIRECTION_EDEFAULT == null ? direction != null : !DIRECTION_EDEFAULT.equals(direction); - case TqclPackage.GO__OBJ: - return OBJ_EDEFAULT == null ? obj != null : !OBJ_EDEFAULT.equals(obj); + case TqclPackage.GO__ACTOR: + return actor != null; } return super.eIsSet(featureID); } @@ -235,8 +249,6 @@ public String toString() StringBuffer result = new StringBuffer(super.toString()); result.append(" (direction: "); result.append(direction); - result.append(", obj: "); - result.append(obj); result.append(')'); return result.toString(); } diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclFactoryImpl.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclFactoryImpl.java index 7892b723..124ae4c7 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclFactoryImpl.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclFactoryImpl.java @@ -78,15 +78,16 @@ public EObject create(EClass eClass) switch (eClass.getClassifierID()) { case TqclPackage.TRIQUETRUM_SCRIPT: return createTriquetrumScript(); + case TqclPackage.COMPOSITE_COMMAND: return createCompositeCommand(); case TqclPackage.COMMAND: return createCommand(); case TqclPackage.INCLUDE: return createInclude(); case TqclPackage.LIBRARY: return createLibrary(); case TqclPackage.INSERT: return createInsert(); case TqclPackage.SET: return createSet(); case TqclPackage.CONNECT: return createConnect(); + case TqclPackage.CONNECTION_PORT: return createConnectionPort(); case TqclPackage.GO: return createGo(); case TqclPackage.PARAMETER: return createParameter(); - case TqclPackage.CONNECTION_PORT: return createConnectionPort(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -137,6 +138,17 @@ public TriquetrumScript createTriquetrumScript() return triquetrumScript; } + /** + * + * + * @generated + */ + public CompositeCommand createCompositeCommand() + { + CompositeCommandImpl compositeCommand = new CompositeCommandImpl(); + return compositeCommand; + } + /** * * @@ -208,10 +220,10 @@ public Connect createConnect() * * @generated */ - public Go createGo() + public ConnectionPort createConnectionPort() { - GoImpl go = new GoImpl(); - return go; + ConnectionPortImpl connectionPort = new ConnectionPortImpl(); + return connectionPort; } /** @@ -219,10 +231,10 @@ public Go createGo() * * @generated */ - public Parameter createParameter() + public Go createGo() { - ParameterImpl parameter = new ParameterImpl(); - return parameter; + GoImpl go = new GoImpl(); + return go; } /** @@ -230,10 +242,10 @@ public Parameter createParameter() * * @generated */ - public ConnectionPort createConnectionPort() + public Parameter createParameter() { - ConnectionPortImpl connectionPort = new ConnectionPortImpl(); - return connectionPort; + ParameterImpl parameter = new ParameterImpl(); + return parameter; } /** diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclPackageImpl.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclPackageImpl.java index af3f1e19..ea6cdef2 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclPackageImpl.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/impl/TqclPackageImpl.java @@ -24,6 +24,7 @@ import org.eclipse.triquetrum.commands.tqcl.Category; import org.eclipse.triquetrum.commands.tqcl.Command; +import org.eclipse.triquetrum.commands.tqcl.CompositeCommand; import org.eclipse.triquetrum.commands.tqcl.Connect; import org.eclipse.triquetrum.commands.tqcl.ConnectionPort; import org.eclipse.triquetrum.commands.tqcl.Go; @@ -51,6 +52,13 @@ public class TqclPackageImpl extends EPackageImpl implements TqclPackage */ private EClass triquetrumScriptEClass = null; + /** + * + * + * @generated + */ + private EClass compositeCommandEClass = null; + /** * * @@ -98,21 +106,21 @@ public class TqclPackageImpl extends EPackageImpl implements TqclPackage * * @generated */ - private EClass goEClass = null; + private EClass connectionPortEClass = null; /** * * * @generated */ - private EClass parameterEClass = null; + private EClass goEClass = null; /** * * * @generated */ - private EClass connectionPortEClass = null; + private EClass parameterEClass = null; /** * @@ -214,6 +222,46 @@ public EReference getTriquetrumScript_Commands() return (EReference)triquetrumScriptEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + public EClass getCompositeCommand() + { + return compositeCommandEClass; + } + + /** + * + * + * @generated + */ + public EReference getCompositeCommand_Start() + { + return (EReference)compositeCommandEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EReference getCompositeCommand_Commands() + { + return (EReference)compositeCommandEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EReference getCompositeCommand_End() + { + return (EReference)compositeCommandEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -369,9 +417,9 @@ public EReference getConnect_To() * * @generated */ - public EClass getGo() + public EClass getConnectionPort() { - return goEClass; + return connectionPortEClass; } /** @@ -379,9 +427,9 @@ public EClass getGo() * * @generated */ - public EAttribute getGo_Direction() + public EReference getConnectionPort_Actor() { - return (EAttribute)goEClass.getEStructuralFeatures().get(0); + return (EReference)connectionPortEClass.getEStructuralFeatures().get(0); } /** @@ -389,9 +437,9 @@ public EAttribute getGo_Direction() * * @generated */ - public EAttribute getGo_Obj() + public EAttribute getConnectionPort_Port() { - return (EAttribute)goEClass.getEStructuralFeatures().get(1); + return (EAttribute)connectionPortEClass.getEStructuralFeatures().get(1); } /** @@ -399,9 +447,9 @@ public EAttribute getGo_Obj() * * @generated */ - public EClass getParameter() + public EClass getGo() { - return parameterEClass; + return goEClass; } /** @@ -409,9 +457,9 @@ public EClass getParameter() * * @generated */ - public EAttribute getParameter_Id() + public EAttribute getGo_Direction() { - return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); + return (EAttribute)goEClass.getEStructuralFeatures().get(0); } /** @@ -419,9 +467,9 @@ public EAttribute getParameter_Id() * * @generated */ - public EAttribute getParameter_Value() + public EReference getGo_Actor() { - return (EAttribute)parameterEClass.getEStructuralFeatures().get(1); + return (EReference)goEClass.getEStructuralFeatures().get(1); } /** @@ -429,9 +477,9 @@ public EAttribute getParameter_Value() * * @generated */ - public EClass getConnectionPort() + public EClass getParameter() { - return connectionPortEClass; + return parameterEClass; } /** @@ -439,9 +487,9 @@ public EClass getConnectionPort() * * @generated */ - public EReference getConnectionPort_Actor() + public EAttribute getParameter_Id() { - return (EReference)connectionPortEClass.getEStructuralFeatures().get(0); + return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); } /** @@ -449,9 +497,9 @@ public EReference getConnectionPort_Actor() * * @generated */ - public EAttribute getConnectionPort_Port() + public EAttribute getParameter_Value() { - return (EAttribute)connectionPortEClass.getEStructuralFeatures().get(1); + return (EAttribute)parameterEClass.getEStructuralFeatures().get(1); } /** @@ -498,6 +546,11 @@ public void createPackageContents() createEReference(triquetrumScriptEClass, TRIQUETRUM_SCRIPT__LIBRARIES); createEReference(triquetrumScriptEClass, TRIQUETRUM_SCRIPT__COMMANDS); + compositeCommandEClass = createEClass(COMPOSITE_COMMAND); + createEReference(compositeCommandEClass, COMPOSITE_COMMAND__START); + createEReference(compositeCommandEClass, COMPOSITE_COMMAND__COMMANDS); + createEReference(compositeCommandEClass, COMPOSITE_COMMAND__END); + commandEClass = createEClass(COMMAND); includeEClass = createEClass(INCLUDE); @@ -519,18 +572,18 @@ public void createPackageContents() createEReference(connectEClass, CONNECT__FROM); createEReference(connectEClass, CONNECT__TO); + connectionPortEClass = createEClass(CONNECTION_PORT); + createEReference(connectionPortEClass, CONNECTION_PORT__ACTOR); + createEAttribute(connectionPortEClass, CONNECTION_PORT__PORT); + goEClass = createEClass(GO); createEAttribute(goEClass, GO__DIRECTION); - createEAttribute(goEClass, GO__OBJ); + createEReference(goEClass, GO__ACTOR); parameterEClass = createEClass(PARAMETER); createEAttribute(parameterEClass, PARAMETER__ID); createEAttribute(parameterEClass, PARAMETER__VALUE); - connectionPortEClass = createEClass(CONNECTION_PORT); - createEReference(connectionPortEClass, CONNECTION_PORT__ACTOR); - createEAttribute(connectionPortEClass, CONNECTION_PORT__PORT); - // Create enums categoryEEnum = createEEnum(CATEGORY); } @@ -564,17 +617,22 @@ public void initializePackageContents() // Set bounds for type parameters // Add supertypes to classes + compositeCommandEClass.getESuperTypes().add(this.getCommand()); includeEClass.getESuperTypes().add(this.getCommand()); insertEClass.getESuperTypes().add(this.getCommand()); setEClass.getESuperTypes().add(this.getCommand()); connectEClass.getESuperTypes().add(this.getCommand()); - goEClass.getESuperTypes().add(this.getCommand()); // Initialize classes and features; add operations and parameters initEClass(triquetrumScriptEClass, TriquetrumScript.class, "TriquetrumScript", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTriquetrumScript_Libraries(), this.getLibrary(), null, "libraries", null, 0, -1, TriquetrumScript.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTriquetrumScript_Commands(), this.getCommand(), null, "commands", null, 0, -1, TriquetrumScript.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(compositeCommandEClass, CompositeCommand.class, "CompositeCommand", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getCompositeCommand_Start(), this.getGo(), null, "start", null, 0, 1, CompositeCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCompositeCommand_Commands(), this.getCommand(), null, "commands", null, 0, -1, CompositeCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCompositeCommand_End(), this.getGo(), null, "end", null, 0, 1, CompositeCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(commandEClass, Command.class, "Command", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(includeEClass, Include.class, "Include", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -596,18 +654,18 @@ public void initializePackageContents() initEReference(getConnect_From(), this.getConnectionPort(), null, "from", null, 0, -1, Connect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConnect_To(), this.getConnectionPort(), null, "to", null, 0, -1, Connect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(connectionPortEClass, ConnectionPort.class, "ConnectionPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getConnectionPort_Actor(), this.getInsert(), null, "actor", null, 0, 1, ConnectionPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getConnectionPort_Port(), ecorePackage.getEString(), "port", null, 0, 1, ConnectionPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(goEClass, Go.class, "Go", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getGo_Direction(), ecorePackage.getEString(), "direction", null, 0, 1, Go.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getGo_Obj(), ecorePackage.getEString(), "obj", null, 0, 1, Go.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGo_Actor(), this.getInsert(), null, "actor", null, 0, 1, Go.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getParameter_Id(), ecorePackage.getEString(), "id", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getParameter_Value(), ecorePackage.getEString(), "value", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(connectionPortEClass, ConnectionPort.class, "ConnectionPort", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getConnectionPort_Actor(), this.getInsert(), null, "actor", null, 0, 1, ConnectionPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getConnectionPort_Port(), ecorePackage.getEString(), "port", null, 0, 1, ConnectionPort.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - // Initialize enums and add enum literals initEEnum(categoryEEnum, Category.class, "Category"); addEEnumLiteral(categoryEEnum, Category.ACTOR); diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclAdapterFactory.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclAdapterFactory.java index 36bd30e4..003f941b 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclAdapterFactory.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclAdapterFactory.java @@ -92,6 +92,11 @@ public Adapter caseTriquetrumScript(TriquetrumScript object) return createTriquetrumScriptAdapter(); } @Override + public Adapter caseCompositeCommand(CompositeCommand object) + { + return createCompositeCommandAdapter(); + } + @Override public Adapter caseCommand(Command object) { return createCommandAdapter(); @@ -122,6 +127,11 @@ public Adapter caseConnect(Connect object) return createConnectAdapter(); } @Override + public Adapter caseConnectionPort(ConnectionPort object) + { + return createConnectionPortAdapter(); + } + @Override public Adapter caseGo(Go object) { return createGoAdapter(); @@ -132,11 +142,6 @@ public Adapter caseParameter(Parameter object) return createParameterAdapter(); } @Override - public Adapter caseConnectionPort(ConnectionPort object) - { - return createConnectionPortAdapter(); - } - @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -173,6 +178,21 @@ public Adapter createTriquetrumScriptAdapter() return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.CompositeCommand Composite Command}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.triquetrum.commands.tqcl.CompositeCommand + * @generated + */ + public Adapter createCompositeCommandAdapter() + { + return null; + } + /** * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.Command Command}'. * @@ -264,46 +284,46 @@ public Adapter createConnectAdapter() } /** - * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.Go Go}'. + * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort Connection Port}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.eclipse.triquetrum.commands.tqcl.Go + * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort * @generated */ - public Adapter createGoAdapter() + public Adapter createConnectionPortAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.Parameter Parameter}'. + * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.Go Go}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.eclipse.triquetrum.commands.tqcl.Parameter + * @see org.eclipse.triquetrum.commands.tqcl.Go * @generated */ - public Adapter createParameterAdapter() + public Adapter createGoAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.ConnectionPort Connection Port}'. + * Creates a new adapter for an object of class '{@link org.eclipse.triquetrum.commands.tqcl.Parameter Parameter}'. * * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. - * @see org.eclipse.triquetrum.commands.tqcl.ConnectionPort + * @see org.eclipse.triquetrum.commands.tqcl.Parameter * @generated */ - public Adapter createConnectionPortAdapter() + public Adapter createParameterAdapter() { return null; } diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclSwitch.java b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclSwitch.java index 6295b463..1a61a44e 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclSwitch.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java-gen/org/eclipse/triquetrum/commands/tqcl/util/TqclSwitch.java @@ -91,6 +91,14 @@ protected T doSwitch(int classifierID, EObject theEObject) if (result == null) result = defaultCase(theEObject); return result; } + case TqclPackage.COMPOSITE_COMMAND: + { + CompositeCommand compositeCommand = (CompositeCommand)theEObject; + T result = caseCompositeCommand(compositeCommand); + if (result == null) result = caseCommand(compositeCommand); + if (result == null) result = defaultCase(theEObject); + return result; + } case TqclPackage.COMMAND: { Command command = (Command)theEObject; @@ -137,11 +145,17 @@ protected T doSwitch(int classifierID, EObject theEObject) if (result == null) result = defaultCase(theEObject); return result; } + case TqclPackage.CONNECTION_PORT: + { + ConnectionPort connectionPort = (ConnectionPort)theEObject; + T result = caseConnectionPort(connectionPort); + if (result == null) result = defaultCase(theEObject); + return result; + } case TqclPackage.GO: { Go go = (Go)theEObject; T result = caseGo(go); - if (result == null) result = caseCommand(go); if (result == null) result = defaultCase(theEObject); return result; } @@ -152,13 +166,6 @@ protected T doSwitch(int classifierID, EObject theEObject) if (result == null) result = defaultCase(theEObject); return result; } - case TqclPackage.CONNECTION_PORT: - { - ConnectionPort connectionPort = (ConnectionPort)theEObject; - T result = caseConnectionPort(connectionPort); - if (result == null) result = defaultCase(theEObject); - return result; - } default: return defaultCase(theEObject); } } @@ -179,6 +186,22 @@ public T caseTriquetrumScript(TriquetrumScript object) return null; } + /** + * Returns the result of interpreting the object as an instance of 'Composite Command'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Composite Command'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCompositeCommand(CompositeCommand object) + { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Command'. * @@ -276,49 +299,49 @@ public T caseConnect(Connect object) } /** - * Returns the result of interpreting the object as an instance of 'Go'. + * Returns the result of interpreting the object as an instance of 'Connection Port'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Go'. + * @return the result of interpreting the object as an instance of 'Connection Port'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseGo(Go object) + public T caseConnectionPort(ConnectionPort object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Parameter'. + * Returns the result of interpreting the object as an instance of 'Go'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Parameter'. + * @return the result of interpreting the object as an instance of 'Go'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseParameter(Parameter object) + public T caseGo(Go object) { return null; } /** - * Returns the result of interpreting the object as an instance of 'Connection Port'. + * Returns the result of interpreting the object as an instance of 'Parameter'. * * This implementation returns null; * returning a non-null result will terminate the switch. * * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Connection Port'. + * @return the result of interpreting the object as an instance of 'Parameter'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseConnectionPort(ConnectionPort object) + public T caseParameter(Parameter object) { return null; } diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/Tqcl.xtext b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/Tqcl.xtext index 6968254b..f08535a8 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/Tqcl.xtext +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/Tqcl.xtext @@ -7,11 +7,20 @@ TriquetrumScript: commands+=Command* ; +CompositeCommand: + start = GoInto commands+=Command end = (GoOut|GoTop) +; + +SimpleCommand returns Command: + (Insert|Connect|Set|Include)";" +; Command returns Command: - (Insert|Connect|Set|GoInto|GoOut|GoTop|Include) ";" + SimpleCommand|CompositeCommand ; + + Include: "include" filename=STRING ";" ; @@ -35,7 +44,7 @@ ConnectionPort: actor=[Insert] '.' port=NamedObj; GoInto returns Go: - "go" direction="into" obj = NamedObj + "go" direction="into" actor = [Insert] ; diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqCLUtils.java b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqCLUtils.java index 5603a8e1..9b5784d9 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqCLUtils.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqCLUtils.java @@ -18,12 +18,13 @@ public static Category getCategory(Insert insert) { } public static String cleanParameterName(String id) { + if (id.startsWith("$")) { return id.substring(1); } else if (id.startsWith("\"")) { return id.substring(1, id.lastIndexOf('"')); } - + // TODO : throw exception??? return null; } diff --git a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqclValidator.java b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqclValidator.java index 732646b0..c78db9ce 100644 --- a/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqclValidator.java +++ b/org.eclipse.triquetrum.commands.xtext/src/main/java/org/eclipse/triquetrum/commands/validation/TqclValidator.java @@ -95,6 +95,9 @@ public void checkEntityParameters(Insert insert) { case DIRECTOR: entityDescriptor = tqclLibraryProvider.getDirector(TqCLUtils.cleanEntityName(entityClass)); break; + case PARAMETER: + entityDescriptor = tqclLibraryProvider.getParameter(TqCLUtils.cleanEntityName(entityClass)); + break; default: break; diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriquetrumLibraryProvider.java b/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriquetrumLibraryProvider.java index d48d53ae..c5d1a3af 100644 --- a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriquetrumLibraryProvider.java +++ b/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriquetrumLibraryProvider.java @@ -33,7 +33,7 @@ public class TriquetrumLibraryProvider implements TqCLLibraryProvider { private static final String TRIQUETRUM_LIBRARY_NAME = "Triquetrum"; private Map actors = new HashMap<>(); private Map directors = new HashMap<>(); - private List parameters = new ArrayList<>(); + private Map parameters = new HashMap<>(); private boolean initialized = false; @@ -70,7 +70,11 @@ private void init() { fillParameters(directorDescriptor); directors.put(directorDescriptor.getClazz(), directorDescriptor); break; - + case Parameter: + ParameterDescriptor parameterDescriptor = new ParameterDescriptor(TRIQUETRUM_LIBRARY_NAME, + displayName, clazz, icon); + fillParameters(parameterDescriptor); + parameters.put(parameterDescriptor.getClazz(), parameterDescriptor); default: break; } @@ -109,7 +113,14 @@ private void fillParameters(EntityDescriptor entityDescriptor) { parameter.setDefaultValue(ptolemyParameter.getDefaultExpression()); entityDescriptor.addParameter(parameter); } - } catch (Exception e) { + if (entityDescriptor instanceof ParameterDescriptor) { + ParameterDescriptor parameter = new ParameterDescriptor(TRIQUETRUM_LIBRARY_NAME, "expression", + String.class.getName(), null); + entityDescriptor.addParameter(parameter); + } + } catch ( + + Exception e) { // LOG e.printStackTrace(); } @@ -128,9 +139,10 @@ public List getDirectors(String library) throws TqCLLibraryE } @Override - public List getParameterTypes(String library) throws TqCLLibraryException { + public List getParameterTypes(String library) throws TqCLLibraryException { - return null; + init(); + return new ArrayList<>(parameters.values()); } @Override @@ -176,7 +188,7 @@ public EntityDescriptor getActor(String library, String actorClass) throws TqCLL public EntityDescriptor getActor(String actorClass) throws TqCLLibraryException { return actors.get(actorClass); } - + @Override public EntityDescriptor getDirector(String directorClass) throws TqCLLibraryException { return directors.get(directorClass); @@ -192,6 +204,8 @@ public boolean hasElementInLibrary(String element, String library, String catego return actors.containsKey(element); case Director: return directors.containsKey(element); + case Parameter: + return parameters.containsKey(element); // TODO: remove default when switch is completed default: return true; @@ -200,4 +214,9 @@ public boolean hasElementInLibrary(String element, String library, String catego return false; } + @Override + public EntityDescriptor getParameter(String parameterClass) { + return parameters.get(parameterClass); + } + }