Commit 7df9c9ab authored by Konrad Pröll's avatar Konrad Pröll
Browse files

Merge branch 'master' of

https://versioncontrolseidl.in.tum.de/compilerconstructionWS16/cup-eclipse-plugin.git

Conflicts:
	CupParser/src/de/in/tum/www2/cup/ast/JavaParser.java
	CupParser/src/de/in/tum/www2/cup/ast/JavaSemantics.java
parents 5aa511c1 25aea616
......@@ -2,9 +2,10 @@ package de.in.tum.www2.cup.ast;
//=========================================================================
//
// This file was generated by Mouse 1.7 at 2016-11-08 14:37:43 GMT
// This file was generated by Mouse 1.7 at 2016-11-09 10:49:44 GMT
// from grammar
// '/home/konrad/workspace/Mouse/examples/example11/Java.1.8.peg'.
// 'C:\workspace\mouse-with-syntaxtree\examples\example11\Java.1.8.peg'.
//
//
//=========================================================================
......@@ -2488,13 +2489,15 @@ public class JavaParser extends mouse.runtime.ParserBase
}
//=====================================================================
// TypeDeclaration = ClassDeclaration / InterfaceDeclaration / SEMI ;
// TypeDeclaration = InterfaceDeclaration / ClassBodyDeclaration /
// MethodBody / SEMI ;
//=====================================================================
private boolean TypeDeclaration()
{
begin("TypeDeclaration");
if (ClassDeclaration()) { sem.$TREE$TypeDeclaration(); return accept(); }
if (InterfaceDeclaration()) { sem.$TREE$TypeDeclaration(); return accept(); }
if (ClassBodyDeclaration()) { sem.$TREE$TypeDeclaration(); return accept(); }
if (MethodBody()) { sem.$TREE$TypeDeclaration(); return accept(); }
if (SEMI()) { sem.$TREE$TypeDeclaration(); return accept(); }
return reject();
}
......
......@@ -2,9 +2,10 @@ package de.in.tum.www2.cup.ast;
//=========================================================================
//
// This skeleton was generated by Mouse 1.7 at 2016-11-08 14:37:43 GMT
// This skeleton was generated by Mouse 1.7 at 2016-11-09 10:49:44 GMT
// from grammar
// '/home/konrad/workspace/Mouse/examples/example11/Java.1.8.peg'.
// 'C:\workspace\mouse-with-syntaxtree\examples\example11\Java.1.8.peg'.
//
//
//=========================================================================
......@@ -2673,7 +2674,8 @@ class JavaSemantics extends mouse.runtime.SemanticsBase implements JavaSemantics
else lhs().put(new XMLElement.NonTerminal("ImportDeclaration",0,elems.toArray(new XMLElement[0])));
}
//=====================================================================
// TypeDeclaration = ClassDeclaration / InterfaceDeclaration / SEMI ;
// TypeDeclaration = InterfaceDeclaration / ClassBodyDeclaration /
// MethodBody / SEMI ;
//=====================================================================
void $TREE$TypeDeclaration(){
LinkedList<XMLElement> elems = new LinkedList<>();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment