svn commit: r1582766 - /uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g

[pkluegl]

Author: pkluegl
Date: Fri Mar 28 14:43:27 2014
New Revision: 1582766

URL: http://svn.apache.org/r1582766
Log:
UIMA-3607
- allow identifiers without dots for packages and types in import statements in 
workbench

Modified:
    
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g

Modified: 
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1582766&r1=1582765&r2=1582766&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
 (original)
+++ 
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
 Fri Mar 28 14:43:27 2014
@@ -340,11 +340,11 @@ importStatement returns [Statement stmt 
        name = dottedComponentDeclaration 
        {if(name != null) {stmt = 
StatementFactory.createImportEngine(name,im);addImportUimafitEngine(name);}}
         SEMI 
-       | im = ImportString type = dottedId2 (FromString ts = 
dottedComponentDeclaration)? (AsString alias = Identifier)? SEMI
+       | im = ImportString type = dottedId (FromString ts = 
dottedComponentDeclaration)? (AsString alias = Identifier)? SEMI
        {stmt = 
StatementFactory.createImportType(im,type,ts,alias);addImportTypeSystem(ts);}
        | im = ImportString STAR FromString ts = dottedComponentDeclaration SEMI
        {stmt = 
StatementFactory.createImportTypeSystem(ts,im);addImportTypeSystem(ts);}
-       | im = ImportString PackageString pkg = dottedId2 (FromString ts = 
dottedComponentDeclaration)? (AsString alias = Identifier)? SEMI
+       | im = ImportString PackageString pkg = dottedId (FromString ts = 
dottedComponentDeclaration)? (AsString alias = Identifier)? SEMI
        {stmt = 
StatementFactory.createImportPackage(im,pkg,ts,alias);addImportTypeSystem(ts);}
        | im = ImportString PackageString STAR FromString ts = 
dottedComponentDeclaration (AsString alias = Identifier)? SEMI
        {stmt = 
StatementFactory.createImportAllPackagew(im,ts,alias);addImportTypeSystem(ts);}