Parser Fixes

DSLEngineering/com.sap.furcas.ide.editor.test/src/com/sap/furcas/ide/editor/contentassist/processor/CtsContentAssistProcessorEditorTestMetamodelTestBase.java

@@ -14,7 +14,7 @@
 import com.sap.furcas.runtime.common.exceptions.ParserInstantiationException;
 import com.sap.furcas.runtime.common.exceptions.ParserInvokationException;
 import com.sap.furcas.runtime.parser.incremental.testbase.GeneratedParserAndFactoryTestConfiguration;
-import com.sap.furcas.runtime.parser.incremental.testbase.MockPartitionAssignmentHandler;
+import com.sap.furcas.runtime.parser.testbase.MockPartitionAssignmentHandler;
 import com.sap.furcas.test.testutils.ResourceTestHelper;
 import com.sap.ide.cts.parser.errorhandling.SemanticParserException;
 import com.sap.ide.cts.parser.incremental.IncrementalParserFacade;

DSLEngineering/com.sap.furcas.ide.editor.test/src/com/sap/furcas/ide/editor/contentassist/processor/TestCtsContentAssistProcessorTCS.java

@@ -13,7 +13,7 @@
 import com.sap.furcas.ide.editor.test.utils.ClassLookupImpl;
 import com.sap.furcas.parsergenerator.TCSSyntaxContainerBean;
 import com.sap.furcas.runtime.parser.incremental.testbase.GeneratedParserAndFactoryTestConfiguration;
-import com.sap.furcas.runtime.parser.incremental.testbase.MockPartitionAssignmentHandler;
+import com.sap.furcas.runtime.parser.testbase.MockPartitionAssignmentHandler;
 import com.sap.furcas.test.fixture.ScenarioFixtureData;
 import com.sap.furcas.test.testutils.ResourceTestHelper;
 import com.sap.ide.cts.parser.incremental.IncrementalParserFacade;

DSLEngineering/com.sap.furcas.ide.editor/src/com/sap/furcas/ide/editor/imp/AbstractFurcasEditor.java

@@ -49,8 +49,8 @@
 import com.sap.furcas.metamodel.FURCAS.TCS.ConcreteSyntax;
 import com.sap.furcas.runtime.common.exceptions.ParserInstantiationException;
 import com.sap.furcas.runtime.parser.PartitionAssignmentHandler;
+import com.sap.furcas.runtime.parser.impl.DefaultPartitionAssignmentHandlerImpl;
 import com.sap.furcas.runtime.parser.impl.ObservableInjectingParser;
-import com.sap.ide.cts.parser.incremental.DefaultPartitionAssignmentHandlerImpl;
 import com.sap.ide.cts.parser.incremental.IncrementalParserFacade;
 
 /**

DSLEngineering/com.sap.furcas.metamodel/src/com/sap/furcas/metamodel/FURCAS/textblocks/impl/DocumentNodeImpl.java

@@ -711,8 +711,8 @@ public String toString() {
         StringBuilder result = new StringBuilder();
         result.append(eClass().getName()).append(", ");
         result.append(getVersion()).append(", ");
-        result.append("o:").append(getOffset()).append(", ");
-        result.append("l:").append(getLength());
+        result.append("o:").append(getOffset()).append(isOffsetRelative() ? "r" : "a");
+        result.append(", ").append("l:").append(getLength());
         return result.toString();
     }
 

DSLEngineering/com.sap.furcas.modeladaptation.emf/src/com/sap/furcas/modeladaptation/emf/adaptation/EcoreModelElementFinder.java

@@ -79,10 +79,6 @@ public EcoreModelElementFinder(ResourceSet resourceSet, Set<URI> referenceScope,
         this.referenceScope = referenceScope;
 
         queryProcessor = QueryProcessorFactory.getDefault().createQueryProcessor(IndexFactory.getInstance());
-        // Profiling data suggests that for our current usage pattern these optimizations do more harm
-        // than good. Stephan Erb 01.11.2011
-        queryProcessor.turnOffOptimizationForPartitionsDuringScheduling();
-        queryProcessor.turnOffOptimizationForElementsDuringScheduling();
     }
 
     /**

DSLEngineering/com.sap.furcas.runtime.parser.incremental.test/fixtures/BibtexWithAlternatives.tcs

@@ -0,0 +1,58 @@
+syntax BibtexWithAlternatives {
+
+  primitiveTemplate identifier for String default using NAME
+  : value = "%token%"
+  ;
+
+  primitiveTemplate stringSymbol for String using STRING
+  : value = "unescapeString(%token%)",
+    serializer="\'%value%\'"
+  ; 
+
+  template BibTextFile main
+  : "Library:"
+    (isDefined(name) ? name {{hasName=true}} : {{hasName=false}})
+  	(isDefined(entries) ? "Entries:" "{" entries "}")
+  ; 
+
+  template BibTextEntry abstract;
+
+  template Article
+  : [[ "@article" "{"      
+  		key ","
+  		"author" "=" "{" author{referenceBy="name", separator="and",
+  			 					lookupScope="OCL:BibText::Author.allInstances()"}
+  			 		 "}"
+  	    "}"
+  	 | "article"
+  	]]    
+  ;
+
+  template Author
+  : [[ name 
+     | "alternative" 
+     | [[ "nestedAlternativeA"  | "nestedAlternativeB" ]]
+     | "nested" (isDefined(name) ? "name" name : [[ "keywordA" | "keywordB" ]] )
+     | (isDefined(name) ? "name" name ) "noElse" 
+    ]]
+  ;
+
+  -- place keywords here (optional, seldom used)
+
+  -- place symbols here (optional)
+        symbols {
+                coma            = "," : leftNone, rightSpace;
+                lcurly          = "{" : leftSpace, rightSpace;
+                rcurly          = "}" : leftSpace, rightSpace;
+        }
+
+  -- place operatorLists here (optional)
+
+  -- place tokens here (optional, except for COMMENT)
+
+  omitted token COMMENT : endOfLine(start = "//");
+
+  -- place lexer here (optional)
+
+}
+

DSLEngineering/com.sap.furcas.runtime.parser.incremental.test/src/com/sap/furcas/runtime/parser/incremental/MockLexerAdapter.java

@@ -21,12 +21,6 @@ public MockLexerAdapter(Lexer antlrLexer) {
     private ANTLRIncrementalLexerAdapter callbackLexer;
     private int nextTokenIndex = 0;
 
-    @Override
-    public int getState(AbstractToken tok) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
     @Override
     public List<AbstractToken> moreTokens() {
         // simulate token consumption on callbacked lexer
@@ -39,12 +33,6 @@ public void setIncrementalLexer(IncrementalLexer incrementalLexer) {
         this.callbackLexer = (ANTLRIncrementalLexerAdapter) incrementalLexer;
     }
 
-    @Override
-    public void setState(int state) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void setNextTokens(List<AbstractToken> nextTokens) {
         this.nextTokens = nextTokens;
     }

DSLEngineering/com.sap.furcas.runtime.parser.incremental.test/src/com/sap/furcas/runtime/parser/incremental/MockLexerAdapterWithLookaheadLLStar.java

@@ -20,11 +20,6 @@ public MockLexerAdapterWithLookaheadLLStar(Lexer antlrLexer) {
     protected ANTLRIncrementalLexerAdapter callbackLexer;
     protected int nextTokenIndex = 0;
 
-    @Override
-    public int getState(AbstractToken tok) {
-        return 0;
-    }
-
     @Override
     public List<AbstractToken> moreTokens() {
         // simulate a lookahead of 1 within a LL(*) parser
@@ -42,10 +37,6 @@ public void setIncrementalLexer(IncrementalLexer incrementalLexer) {
         this.callbackLexer = (ANTLRIncrementalLexerAdapter) incrementalLexer;
     }
 
-    @Override
-    public void setState(int state) {
-    }
-
     public void setNextTokens(List<AbstractToken> nextTokens) {
         this.nextTokens = nextTokens;
     }