[Jsce-develop] SF.net SVN: jsce:[389] trunk/jsc.core
Status: Alpha
Brought to you by:
dkleinrath
Menu
▾
▴
[Jsce-develop] SF.net SVN: jsce:[389] trunk/jsc.core
|
From: <dkl...@us...> - 2012-11-28 08:37:54
|
Revision: 389
http://jsce.svn.sourceforge.net/jsce/?rev=389&view=rev
Author: dkleinrath
Date: 2012-11-28 08:37:43 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Changed recovery rules for ClassDef and changed ASTNode IndexedType
Modified Paths:
--------------
trunk/jsc.core/.project
trunk/jsc.core/imp/jsc/imp/parser/IAst.java
trunk/jsc.core/imp/jsc/imp/parser/JSCLexer.java
trunk/jsc.core/imp/jsc/imp/parser/JSCParser.g
trunk/jsc.core/imp/jsc/imp/parser/JSCParser.java
trunk/jsc.core/imp/jsc/imp/parser/JSCParser.l
trunk/jsc.core/imp/jsc/imp/parser/JSCParserprs.java
trunk/jsc.core/imp/jsc/imp/parser/JSCParsersym.java
trunk/jsc.core/src/jsc/core/dom/ASTConverter.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ASTNode.java
trunk/jsc.core/src/jsc/imp/parser/Ast/AbstractExpression.java
trunk/jsc.core/src/jsc/imp/parser/Ast/AbstractNameReference.java
trunk/jsc.core/src/jsc/imp/parser/Ast/AbstractTypeDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/AbstractVariable.java
trunk/jsc.core/src/jsc/imp/parser/Ast/AbstractVisitor.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Adverb.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ArgDecls.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Array.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ArrayElement.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ArrayElementList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/BinOP.java
trunk/jsc.core/src/jsc/imp/parser/Ast/BlockExpr.java
trunk/jsc.core/src/jsc/imp/parser/Ast/BlockList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/BooleanLiteral.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Char.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassExtension.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassExtensionList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassName.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassVarDecl.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ClassVarDeclList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/CompilationUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ConstDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ConstDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/CopySeriesArgList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/CurryArg.java
trunk/jsc.core/src/jsc/imp/parser/Ast/DictLiteral2.java
trunk/jsc.core/src/jsc/imp/parser/Ast/DictSlotDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/DictSlotDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/EnvirVar.java
trunk/jsc.core/src/jsc/imp/parser/Ast/EprAssign.java
trunk/jsc.core/src/jsc/imp/parser/Ast/EprMultiAssign.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Event.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ExprBinOp.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ExprPut.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ExprSeqList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ExpressionContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ExpressionList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/False.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FreeFormUnitCode.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FreeFormUnitCodeList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FreeFormUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FuncVarDecl.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FuncVarDeclList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Function.java
trunk/jsc.core/src/jsc/imp/parser/Ast/FunctionBody.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Generator.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IASTNodeToken.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IAscii.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IBinOP.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IBinOP2.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IBlock.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IClassContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IClassExtension.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IClassExtensions.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IClassName.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IClasses.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ICompilationUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IDictLit2.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IEnvirVar.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExpr1.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExprCopySeries.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExprPutSeries.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExprSeq.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExpression.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExpressionContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IExpressionList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IFalseObj.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IFloat.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IFreeFormUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IFuncBody.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IFunction.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IGenerator.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IIndexedType.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IInteger.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IInterpreterUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IKeyArg.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IKeyBinOP.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IListLit.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IListLit2.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IListLiteral.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMessageName.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMethBody.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMethodContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgAt.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgCopySeries.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgFunctNotation.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgNew.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgNewAdd.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgSend.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgSendToFunct.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgToExpr.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IMsgValue.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IName.java
trunk/jsc.core/src/jsc/imp/parser/Ast/INilObj.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IOptComma.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IOptEqual.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IOptKeyArgList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IOptSemi.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IPushLiteral.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IPushName.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IRWSpec.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IReturnVal.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ISimpleFloat.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ISlotLiteral.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IString.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IStringList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ISymbol.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ITrueObj.java
trunk/jsc.core/src/jsc/imp/parser/Ast/IndexedType.java
trunk/jsc.core/src/jsc/imp/parser/Ast/InterpreterUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/KeyArg.java
trunk/jsc.core/src/jsc/imp/parser/Ast/KeyArgList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/KeyBinOP.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ListLiteralList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/LitDictSlotDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/LitDictSlotDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MethodBody.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MethodContents.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MethodDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MethodDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgAt.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgCopySeries.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgFunctNotation.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgNew.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgNewAdd.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgSendToFunct.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgToExpr.java
trunk/jsc.core/src/jsc/imp/parser/Ast/MsgValue.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Name.java
trunk/jsc.core/src/jsc/imp/parser/Ast/NameList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Nil.java
trunk/jsc.core/src/jsc/imp/parser/Ast/OptKeyArgList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ParseUnitDeclaration.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Primitive.java
trunk/jsc.core/src/jsc/imp/parser/Ast/PutSeries.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Qualifier.java
trunk/jsc.core/src/jsc/imp/parser/Ast/QualifierList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/RWSlotDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/RWSlotDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Reference.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ReturnVal.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Root.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Routine.java
trunk/jsc.core/src/jsc/imp/parser/Ast/SC_Float.java
trunk/jsc.core/src/jsc/imp/parser/Ast/SC_Integer.java
trunk/jsc.core/src/jsc/imp/parser/Ast/SC_String.java
trunk/jsc.core/src/jsc/imp/parser/Ast/StringList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Symbol.java
trunk/jsc.core/src/jsc/imp/parser/Ast/True.java
trunk/jsc.core/src/jsc/imp/parser/Ast/ValueRange.java
trunk/jsc.core/src/jsc/imp/parser/Ast/VarDef.java
trunk/jsc.core/src/jsc/imp/parser/Ast/VarDefList.java
trunk/jsc.core/src/jsc/imp/parser/Ast/Visitor.java
trunk/jsc.core/src/jsc/imp/parser/IAst.java
trunk/jsc.core/src/jsc/imp/parser/JSCKWLexer.java
trunk/jsc.core/src/jsc/imp/parser/JSCKWLexerprs.java
trunk/jsc.core/src/jsc/imp/parser/JSCKWLexersym.java
trunk/jsc.core/src/jsc/imp/parser/JSCLexer.java
trunk/jsc.core/src/jsc/imp/parser/JSCLexerprs.java
trunk/jsc.core/src/jsc/imp/parser/JSCLexersym.java
trunk/jsc.core/src/jsc/imp/parser/JSCParser.java
trunk/jsc.core/src/jsc/imp/parser/JSCParserprs.java
trunk/jsc.core/src/jsc/imp/parser/JSCParsersym.java
trunk/jsc.core/src/jsc/imp/parser/docast/IJSCDocLiteral.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdoc.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocFieldReference.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocImplicitTypeReference.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocNameStatement.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocSingleNameReference.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocSingleNameReferenceTag.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocSingleTypeReference.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocStringLiteral.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocSymbolLiteral.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocTypeParameter.java
trunk/jsc.core/src/jsc/imp/parser/docast/JSCdocTypeReferenceStatement.java
trunk/jsc.core/src/jsc/imp/parser/docast/RuntimeAnnotation.java
trunk/jsc.core/src/jsc/internal/compiler/ASTVisitor.java
trunk/jsc.core/src/jsc/internal/compiler/SourceElementNotifier.java
trunk/jsc.core/src/jsc/internal/compiler/parser/AbstractJSCParser.java
trunk/jsc.core/src/jsc/internal/compiler/parser/IJSCParserRules.java
trunk/jsc.core/src/jsc/internal/compiler/problem/ProblemReporter.java
trunk/jsc.core/src/jsc/internal/formatter/CodeFormatterVisitor.java
Added Paths:
-----------
trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch
Removed Paths:
-------------
trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder.launch
Added: trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch
===================================================================
--- trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch (rev 0)
+++ trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch 2012-11-28 08:37:43 UTC (rev 389)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.imp.lpg.ide.LPGBuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
Property changes on: trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder.launch
===================================================================
--- trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder.launch 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder.launch 2012-11-28 08:37:43 UTC (rev 389)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.imp.lpg.ide.LPGBuilder"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
Modified: trunk/jsc.core/.project
===================================================================
--- trunk/jsc.core/.project 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/.project 2012-11-28 08:37:43 UTC (rev 389)
@@ -11,7 +11,7 @@
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder.launch</value>
+ <value><project>/.externalToolBuilders/org.eclipse.imp.lpg.ide.LPGBuilder (4).launch</value>
</dictionary>
</arguments>
</buildCommand>
Modified: trunk/jsc.core/imp/jsc/imp/parser/IAst.java
===================================================================
--- trunk/jsc.core/imp/jsc/imp/parser/IAst.java 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/imp/jsc/imp/parser/IAst.java 2012-11-28 08:37:43 UTC (rev 389)
@@ -1,5 +1,5 @@
- //#line 758 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 766 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
package jsc.imp.parser;
Modified: trunk/jsc.core/imp/jsc/imp/parser/JSCLexer.java
===================================================================
--- trunk/jsc.core/imp/jsc/imp/parser/JSCLexer.java 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/imp/jsc/imp/parser/JSCLexer.java 2012-11-28 08:37:43 UTC (rev 389)
@@ -1,13 +1,13 @@
package jsc.imp.parser;
- //#line 123 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/LexerTemplateF.gi
+ //#line 123 "LexerTemplateF.gi
import lpg.runtime.*;
//#line 6 "JSCLexer.gi
import java.util.*;
- //#line 128 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/LexerTemplateF.gi
+ //#line 128 "LexerTemplateF.gi
public class JSCLexer extends Object implements RuleAction
{
@@ -243,7 +243,7 @@
}
}
- //#line 5 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/include/LexerBasicMapF.gi
+ //#line 5 "LexerBasicMapF.gi
//
// The Lexer contains an array of characters as the input stream to be parsed.
@@ -504,7 +504,7 @@
public boolean tokenizeWhiteSpace = false;
public boolean tokenizeComments = false;
- //#line 366 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/LexerTemplateF.gi
+ //#line 366 "LexerTemplateF.gi
public void ruleAction(int ruleNumber)
{
@@ -904,7 +904,7 @@
if(!skipBodys || !insideBody)makeToken(JSCParsersym.TK_BINOP);else skipToken();
break;
}
- //#line 370 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/LexerTemplateF.gi
+ //#line 370 "LexerTemplateF.gi
default:
Modified: trunk/jsc.core/imp/jsc/imp/parser/JSCParser.g
===================================================================
--- trunk/jsc.core/imp/jsc/imp/parser/JSCParser.g 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/imp/jsc/imp/parser/JSCParser.g 2012-11-28 08:37:43 UTC (rev 389)
@@ -57,7 +57,7 @@
SC_FLOAT
ASCII -- Characters
-SYMBOL STRING
+SYMBOL STRING
DOTDOT ELLIPSIS BEGINCLOSEDFUNC LEFTARROW
READWRITEVAR
@@ -115,7 +115,7 @@
%Recover
--MissingExpression MissingLiteral MissingIdentifier MissingToken
- MissingRightBrace
+ MissingToken
%End
%Rules
@@ -184,36 +184,44 @@
Classes$$ClassDef ::= ClassDef
| Classes ClassDef
ClassDef$ClassDef ::=
- CLASSNAME$Name '{'$ ClassVarDecls Methods '}'$
- | CLASSNAME$Name ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods '}'$
- | CLASSNAME$Name '['$ IndexedType ']'$ '{'$ ClassVarDecls Methods '}'$
- | CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods '}'$
- | CLASSNAME$Name '{'$ ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name ClassVarDecls Methods MissingRightBrace$ -- for recovering from missing braces
- | CLASSNAME$Name ClassVarDecls Methods '}'$ -- for recovering from missing braces
- | CLASSNAME$Name ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name ':'$ ClassName$SuperClass ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name ':'$ ClassName$SuperClass ClassVarDecls Methods '}'$
- | CLASSNAME$Name '['$ IndexedType ']'$ '{'$ ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name '['$ IndexedType ']'$ ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name '['$ IndexedType ']'$ ClassVarDecls Methods '}'$
- | CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass ClassVarDecls Methods MissingRightBrace$
- | CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass ClassVarDecls Methods '}'$
+ CLASSNAME$Name IndexedType '{'$ ClassVarDecls Methods '}'$
+ | CLASSNAME$Name IndexedType ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods '}'$
+ | CLASSNAME$Name IndexedType '{'$ ClassVarDecls Methods MissingToken$
+ | CLASSNAME$Name IndexedType ClassVarDecls Methods MissingToken$ -- for recovering from missing braces
+ | CLASSNAME$Name IndexedType ClassVarDecls Methods '}'$ -- for recovering from missing left braces
+ | CLASSNAME$Name IndexedType ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods MissingToken$
+ | CLASSNAME$Name IndexedType ':'$ ClassName$SuperClass ClassVarDecls Methods MissingToken$
+ | CLASSNAME$Name IndexedType ':'$ ClassName$SuperClass ClassVarDecls Methods '}'$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ '{'$ ClassVarDecls Methods '}'$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods '}'$
+ -- | CLASSNAME$Name '['$ IndexedType ']'$ '{'$ ClassVarDecls Methods MissingRightBrace$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ClassVarDecls Methods MissingRightBrace$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ClassVarDecls Methods '}'$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass '{'$ ClassVarDecls Methods MissingRightBrace$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass ClassVarDecls Methods MissingRightBrace$
+ --| CLASSNAME$Name '['$ IndexedType ']'$ ':'$ ClassName$SuperClass ClassVarDecls Methods '}'$
-
+
-- indexed type. Must be one of: slot, double, float, int8, int16, int32, char
+
IndexedType$IndexedType ::= %empty
- | SLOT$Name | DOUBLE$Name | FLOAT$Name | INT8$Name
- | INT16$Name | INT32$Name | CHAR$Name | SYM$Name
+ | '['$ Name$Name ']'$
+ | '['$ ']'$
+ | '['$ Name$Name MissingToken$
+ | '['$ MissingToken$
+
+
+--IndexedType$IndexedType ::= %empty
+-- | SLOT$Name | DOUBLE$Name | FLOAT$Name | INT8$Name
+-- | INT16$Name | INT32$Name | CHAR$Name | SYM$Name
-------------------------------------------------------------------
ClassExtensions$$ClassExtension ::= ClassExtension
| ClassExtensions ClassExtension
ClassExtension$ClassExtension ::= '+'$ ClassName$Name '{'$ Methods '}'$
- | '+'$ ClassName$Name '{'$ Methods MissingRightBrace$
- | '+'$ ClassName$Name Methods MissingRightBrace$-- for recovering from missing braces
+ | '+'$ ClassName$Name '{'$ Methods MissingToken$
+ | '+'$ ClassName$Name Methods MissingToken$-- for recovering from missing braces
| '+'$ ClassName$Name Methods '}'$ -- for recovering from missing braces
-------------------------------------------------------------------
Modified: trunk/jsc.core/imp/jsc/imp/parser/JSCParser.java
===================================================================
--- trunk/jsc.core/imp/jsc/imp/parser/JSCParser.java 2012-11-27 11:39:46 UTC (rev 388)
+++ trunk/jsc.core/imp/jsc/imp/parser/JSCParser.java 2012-11-28 08:37:43 UTC (rev 389)
@@ -2,7 +2,7 @@
import jsc.imp.parser.Ast.*;
- //#line 161 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/btParserTemplateF.gi
+ //#line 161 "btParserTemplateF.gi
import lpg.runtime.*;
//#line 16 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
@@ -20,7 +20,7 @@
import jsc.internal.compiler.problem.*;
import jsc.imp.parser.*;
- //#line 166 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/btParserTemplateF.gi
+ //#line 166 "btParserTemplateF.gi
public class JSCParser extends jsc.internal.compiler.parser.AbstractJSCParser implements RuleAction
{
@@ -179,7 +179,7 @@
//
- //#line 328 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/lpg/templates/btParserTemplateF.gi
+ //#line 328 "btParserTemplateF.gi
@SuppressWarnings("unchecked") // Casting Object to various generic types
public void ruleAction(int ruleNumber)
@@ -548,7 +548,7 @@
break;
}
//
- // Rule 22: ClassDef ::= CLASSNAME$Name {$ ClassVarDecls Methods }$
+ // Rule 22: ClassDef ::= CLASSNAME$Name IndexedType {$ ClassVarDecls Methods }$
//
case 22: {
//#line 186 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -558,19 +558,19 @@
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(3),
+ (IndexedType)getRhsSym(2),
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(4),
+ (ClassVarDeclList)getRhsSym(4),
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
+ (MethodDefList)getRhsSym(5),
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)null)
//#line 186 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 23: ClassDef ::= CLASSNAME$Name :$ ClassName$SuperClass {$ ClassVarDecls Methods }$
+ // Rule 23: ClassDef ::= CLASSNAME$Name IndexedType :$ ClassName$SuperClass {$ ClassVarDecls Methods }$
//
case 23: {
//#line 188 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -580,19 +580,19 @@
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(5),
+ (IndexedType)getRhsSym(2),
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(6),
+ (ClassVarDeclList)getRhsSym(6),
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(3),
+ (MethodDefList)getRhsSym(7),
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)getRhsSym(4))
//#line 188 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 24: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ {$ ClassVarDecls Methods }$
+ // Rule 24: ClassDef ::= CLASSNAME$Name IndexedType {$ ClassVarDecls Methods MissingToken$
//
case 24: {
//#line 189 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -602,19 +602,19 @@
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(6),
+ (IndexedType)getRhsSym(2),
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(7),
+ (ClassVarDeclList)getRhsSym(4),
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
+ (MethodDefList)getRhsSym(5),
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
+ (ClassName)null)
//#line 189 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 25: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ :$ ClassName$SuperClass {$ ClassVarDecls Methods }$
+ // Rule 25: ClassDef ::= CLASSNAME$Name IndexedType ClassVarDecls Methods MissingToken$
//
case 25: {
//#line 190 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -624,19 +624,19 @@
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(8),
+ (IndexedType)getRhsSym(2),
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(9),
+ (ClassVarDeclList)getRhsSym(3),
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(6),
+ (MethodDefList)getRhsSym(4),
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
+ (ClassName)null)
//#line 190 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 26: ClassDef ::= CLASSNAME$Name {$ ClassVarDecls Methods MissingRightBrace$
+ // Rule 26: ClassDef ::= CLASSNAME$Name IndexedType ClassVarDecls Methods }$
//
case 26: {
//#line 191 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -646,19 +646,19 @@
//#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ (IndexedType)getRhsSym(2),
+ //#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
(ClassVarDeclList)getRhsSym(3),
//#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
(MethodDefList)getRhsSym(4),
//#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
- //#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)null)
//#line 191 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 27: ClassDef ::= CLASSNAME$Name ClassVarDecls Methods MissingRightBrace$
+ // Rule 27: ClassDef ::= CLASSNAME$Name IndexedType :$ ClassName$SuperClass {$ ClassVarDecls Methods MissingToken$
//
case 27: {
//#line 192 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -668,19 +668,19 @@
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(2),
+ (IndexedType)getRhsSym(2),
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(3),
+ (ClassVarDeclList)getRhsSym(6),
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
+ (MethodDefList)getRhsSym(7),
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)getRhsSym(4))
//#line 192 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 28: ClassDef ::= CLASSNAME$Name ClassVarDecls Methods }$
+ // Rule 28: ClassDef ::= CLASSNAME$Name IndexedType :$ ClassName$SuperClass ClassVarDecls Methods MissingToken$
//
case 28: {
//#line 193 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -690,19 +690,19 @@
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(2),
+ (IndexedType)getRhsSym(2),
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(3),
+ (ClassVarDeclList)getRhsSym(5),
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
+ (MethodDefList)getRhsSym(6),
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)getRhsSym(4))
//#line 193 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 29: ClassDef ::= CLASSNAME$Name :$ ClassName$SuperClass {$ ClassVarDecls Methods MissingRightBrace$
+ // Rule 29: ClassDef ::= CLASSNAME$Name IndexedType :$ ClassName$SuperClass ClassVarDecls Methods }$
//
case 29: {
//#line 194 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
@@ -712,3603 +712,3307 @@
//#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeASTNodeToken(getRhsIToken(1)),
//#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ (IndexedType)getRhsSym(2),
+ //#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
(ClassVarDeclList)getRhsSym(5),
//#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
(MethodDefList)getRhsSym(6),
//#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(3),
- //#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
+ (ClassName)getRhsSym(4))
//#line 194 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 30: ClassDef ::= CLASSNAME$Name :$ ClassName$SuperClass ClassVarDecls Methods MissingRightBrace$
+ // Rule 30: IndexedType ::= $Empty
//
case 30: {
- //#line 195 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(4),
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(5),
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(3),
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
- //#line 195 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 31: ClassDef ::= CLASSNAME$Name :$ ClassName$SuperClass ClassVarDecls Methods }$
- //
- case 31: {
- //#line 196 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(4),
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(5),
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(3),
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)null)
- //#line 196 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 32: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ {$ ClassVarDecls Methods MissingRightBrace$
- //
- case 32: {
- //#line 197 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(6),
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(7),
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 197 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 33: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ ClassVarDecls Methods MissingRightBrace$
- //
- case 33: {
- //#line 198 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(5),
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(6),
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 198 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 34: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ ClassVarDecls Methods }$
- //
- case 34: {
- //#line 199 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(5),
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(6),
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)null,
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 199 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 35: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ :$ ClassName$SuperClass {$ ClassVarDecls Methods MissingRightBrace$
- //
- case 35: {
- //#line 200 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(8),
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(9),
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(6),
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 200 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 36: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ :$ ClassName$SuperClass ClassVarDecls Methods MissingRightBrace$
- //
- case 36: {
- //#line 201 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(7),
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(8),
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(6),
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 201 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 37: ClassDef ::= CLASSNAME$Name [$ IndexedType ]$ :$ ClassName$SuperClass ClassVarDecls Methods }$
- //
- case 37: {
- //#line 202 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeClassDef(getLeftIToken(), getRightIToken(),
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)),
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassVarDeclList)getRhsSym(7),
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (MethodDefList)getRhsSym(8),
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ClassName)getRhsSym(6),
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (IndexedType)getRhsSym(3))
- //#line 202 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 38: IndexedType ::= $Empty
- //
- case 38: {
- //#line 207 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 207 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 207 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- (ASTNodeToken)null)
- //#line 207 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 39: IndexedType ::= SLOT$Name
- //
- case 39: {
//#line 208 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
//#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeIndexedType(getLeftIToken(), getRightIToken(),
//#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
+ (Name)null)
//#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 40: IndexedType ::= DOUBLE$Name
+ // Rule 31: IndexedType ::= [$ Name$Name ]$
//
- case 40: {
- //#line 208 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 41: IndexedType ::= FLOAT$Name
- //
- case 41: {
- //#line 208 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 42: IndexedType ::= INT8$Name
- //
- case 42: {
- //#line 208 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
- setResult(
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 208 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- );
- break;
- }
- //
- // Rule 43: IndexedType ::= INT16$Name
- //
- case 43: {
+ case 31: {
//#line 209 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
//#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeIndexedType(getLeftIToken(), getRightIToken(),
//#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
+ (Name)getRhsSym(2))
//#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 44: IndexedType ::= INT32$Name
+ // Rule 32: IndexedType ::= [$ ]$
//
- case 44: {
- //#line 209 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ case 32: {
+ //#line 210 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 210 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 210 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ (Name)null)
+ //#line 210 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 45: IndexedType ::= CHAR$Name
+ // Rule 33: IndexedType ::= [$ Name$Name MissingToken$
//
- case 45: {
- //#line 209 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ case 33: {
+ //#line 211 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 211 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 211 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ (Name)getRhsSym(2))
+ //#line 211 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 46: IndexedType ::= SYM$Name
+ // Rule 34: IndexedType ::= [$ MissingToken$
//
- case 46: {
- //#line 209 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ case 34: {
+ //#line 212 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 212 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeIndexedType(getLeftIToken(), getRightIToken(),
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
- consumeASTNodeToken(getRhsIToken(1)))
- //#line 209 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 212 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ (Name)null)
+ //#line 212 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 47: ClassExtensions ::= ClassExtension
+ // Rule 35: ClassExtensions ::= ClassExtension
//
- case 47: {
- //#line 212 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ case 35: {
+ //#line 220 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
setResult(
- //#line 212 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 220 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
consumeClassExtensionList((ClassExtension)getRhsSym(1), true /* left recursive */)
- //#line 212 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
+ //#line 220 D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g
);
break;
}
//
- // Rule 48: ClassExtensions ::= ClassExtensions ClassExtension
+ // Rule 36: ClassExtensions ::= ClassExtensions ClassExtension
//
- case 48: {
- //#line 213 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ case 36: {
+ //#line 221 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
((ClassExtensionList)getRhsSym(1)).addElement((ClassExtension)getRhsSym(2));
break;
}
//
- // Rule 49: ClassExtension ::= +$ ClassName$Name {$ Methods }$
+ // Rule 37: ClassExtension ::= +$ ClassName$Name {$ Methods }$
//
- case 49: {
- //#line 214 "D:/_Eclipse_Workspace_/JSCEclipse/jsc.core/imp/jsc/imp/parser/JSCParser.g"
+ ...
[truncated message content] |
