Unit construction operator syntax changed.

plugins/org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/AbstractMscriptProposalProvider.java

@@ -282,8 +282,7 @@ public class AbstractMscriptProposalProvider extends AbstractJavaBasedContentPro
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeNameComponent_Identifier(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-		completeRuleCall(((RuleCall)((Alternatives)assignment.getTerminal()).getElements().get(0)), context, acceptor);
-		// subclasses may override
+		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
 	}
 	public void completeArrayElementAccess_Subscripts(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
 		completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

plugins/org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/MscriptParser.java

@@ -53,7 +53,6 @@ public class MscriptParser extends AbstractContentAssistParser {
 					put(grammarAccess.getNumericLiteralAccess().getAlternatives(), "rule__NumericLiteral__Alternatives");
 					put(grammarAccess.getFeatureCallAccess().getAlternatives(), "rule__FeatureCall__Alternatives");
 					put(grammarAccess.getFeatureCallPartAccess().getAlternatives(), "rule__FeatureCallPart__Alternatives");
-					put(grammarAccess.getNameComponentAccess().getIdentifierAlternatives_1_0(), "rule__NameComponent__IdentifierAlternatives_1_0");
 					put(grammarAccess.getArraySubscriptAccess().getAlternatives(), "rule__ArraySubscript__Alternatives");
 					put(grammarAccess.getArrayConstructionOperatorAccess().getAlternatives_2(), "rule__ArrayConstructionOperator__Alternatives_2");
 					put(grammarAccess.getUnitExpressionNumeratorAccess().getAlternatives(), "rule__UnitExpressionNumerator__Alternatives");

plugins/org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g

@@ -2800,30 +2800,6 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__NameComponent__IdentifierAlternatives_1_0
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0_0()); }
-	RULE_ID
-{ after(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0_0()); }
-)
-
-    |(
-{ before(grammarAccess.getNameComponentAccess().getIdentifierUnitKeyword_1_0_1()); }
-
-	'unit' 
-
-{ after(grammarAccess.getNameComponentAccess().getIdentifierUnitKeyword_1_0_1()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
 rule__ArraySubscript__Alternatives
     @init {
 		int stackSize = keepStackSize();
@@ -13525,11 +13501,11 @@ rule__UnitConstructionOperator__Group__0__Impl
     }
 :
 (
-{ before(grammarAccess.getUnitConstructionOperatorAccess().getUnitKeyword_0()); }
+{ before(grammarAccess.getUnitConstructionOperatorAccess().getDollarSignKeyword_0()); }
 
-	'unit' 
+	'$' 
 
-{ after(grammarAccess.getUnitConstructionOperatorAccess().getUnitKeyword_0()); }
+{ after(grammarAccess.getUnitConstructionOperatorAccess().getDollarSignKeyword_0()); }
 )
 
 ;
@@ -16380,9 +16356,8 @@ rule__NameComponent__IdentifierAssignment_1
     }
 :
 (
-{ before(grammarAccess.getNameComponentAccess().getIdentifierAlternatives_1_0()); }
-(rule__NameComponent__IdentifierAlternatives_1_0)
-{ after(grammarAccess.getNameComponentAccess().getIdentifierAlternatives_1_0()); }
+{ before(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0()); }
+	RULE_ID{ after(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0()); }
 )
 
 ;

plugins/org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.tokens

@@ -7,68 +7,68 @@ RULE_SL_COMMENT=9
 RULE_INTEGER=6
 RULE_ML_COMMENT=8
 'end'=75
-'>='=23
-'/'=27
-'=='=18
-'switch'=64
-'then'=62
-'string'=58
-'type'=39
-'>'=22
-'||'=68
-'&&'=69
-'complex'=55
-';'=41
-'warning'=15
-'for'=73
-'+'=24
-'.'=71
-'=>'=67
-'is'=70
-'^'=30
-'error'=16
+'>='=22
+'/'=26
+'=='=17
+'switch'=63
+'then'=61
+'string'=57
+'type'=38
+'>'=21
+'||'=67
+'&&'=68
+'complex'=54
+';'=40
+'warning'=14
+'for'=72
+'+'=23
+'.'=70
+'=>'=66
+'is'=69
+'^'=29
+'error'=15
+'$'=73
 'static'=77
-'true'=34
-'else'=63
-'func'=44
-'let'=59
-'fatal'=17
-'{'=36
+'true'=33
+'else'=62
+'func'=43
+'let'=58
+'fatal'=16
+'{'=35
 'stateful'=76
 '\''=12
-'var'=49
-'int'=54
-'if'=61
-':'=43
-'('=45
-'-'=25
-','=38
-'default'=65
-'in'=60
-']'=53
-'enum'=35
-'real'=51
-'!'=32
-'|'=72
-'assert'=48
+'var'=48
+'int'=53
+'if'=60
+':'=42
+'('=44
+'-'=24
+','=37
+'default'=64
+'in'=59
+']'=52
+'enum'=34
+'real'=50
+'!'=31
+'|'=71
+'assert'=47
 'begin'=74
-'.^'=31
-'.*'=28
-'info'=14
-'='=40
-'unit'=13
-'functor'=50
-')'=46
-'bool'=57
-'./'=29
-'->'=47
-'case'=66
-'}'=37
-'<='=21
-'!='=19
-'false'=33
-'<'=20
-'*'=26
-'['=52
-'gauss'=56
-'record'=42
+'.^'=30
+'.*'=27
+'info'=13
+'='=39
+'functor'=49
+')'=45
+'bool'=56
+'./'=28
+'->'=46
+'case'=65
+'}'=36
+'<='=20
+'!='=18
+'false'=32
+'<'=19
+'*'=25
+'['=51
+'gauss'=55
+'record'=41

plugins/org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript__.g

@@ -8,94 +8,94 @@ import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.Lexer;
 }
 
 T12 : '\'' ;
-T13 : 'unit' ;
-T14 : 'info' ;
-T15 : 'warning' ;
-T16 : 'error' ;
-T17 : 'fatal' ;
-T18 : '==' ;
-T19 : '!=' ;
-T20 : '<' ;
-T21 : '<=' ;
-T22 : '>' ;
-T23 : '>=' ;
-T24 : '+' ;
-T25 : '-' ;
-T26 : '*' ;
-T27 : '/' ;
-T28 : '.*' ;
-T29 : './' ;
-T30 : '^' ;
-T31 : '.^' ;
-T32 : '!' ;
-T33 : 'false' ;
-T34 : 'true' ;
-T35 : 'enum' ;
-T36 : '{' ;
-T37 : '}' ;
-T38 : ',' ;
-T39 : 'type' ;
-T40 : '=' ;
-T41 : ';' ;
-T42 : 'record' ;
-T43 : ':' ;
-T44 : 'func' ;
-T45 : '(' ;
-T46 : ')' ;
-T47 : '->' ;
-T48 : 'assert' ;
-T49 : 'var' ;
-T50 : 'functor' ;
-T51 : 'real' ;
-T52 : '[' ;
-T53 : ']' ;
-T54 : 'int' ;
-T55 : 'complex' ;
-T56 : 'gauss' ;
-T57 : 'bool' ;
-T58 : 'string' ;
-T59 : 'let' ;
-T60 : 'in' ;
-T61 : 'if' ;
-T62 : 'then' ;
-T63 : 'else' ;
-T64 : 'switch' ;
-T65 : 'default' ;
-T66 : 'case' ;
-T67 : '=>' ;
-T68 : '||' ;
-T69 : '&&' ;
-T70 : 'is' ;
-T71 : '.' ;
-T72 : '|' ;
-T73 : 'for' ;
+T13 : 'info' ;
+T14 : 'warning' ;
+T15 : 'error' ;
+T16 : 'fatal' ;
+T17 : '==' ;
+T18 : '!=' ;
+T19 : '<' ;
+T20 : '<=' ;
+T21 : '>' ;
+T22 : '>=' ;
+T23 : '+' ;
+T24 : '-' ;
+T25 : '*' ;
+T26 : '/' ;
+T27 : '.*' ;
+T28 : './' ;
+T29 : '^' ;
+T30 : '.^' ;
+T31 : '!' ;
+T32 : 'false' ;
+T33 : 'true' ;
+T34 : 'enum' ;
+T35 : '{' ;
+T36 : '}' ;
+T37 : ',' ;
+T38 : 'type' ;
+T39 : '=' ;
+T40 : ';' ;
+T41 : 'record' ;
+T42 : ':' ;
+T43 : 'func' ;
+T44 : '(' ;
+T45 : ')' ;
+T46 : '->' ;
+T47 : 'assert' ;
+T48 : 'var' ;
+T49 : 'functor' ;
+T50 : 'real' ;
+T51 : '[' ;
+T52 : ']' ;
+T53 : 'int' ;
+T54 : 'complex' ;
+T55 : 'gauss' ;
+T56 : 'bool' ;
+T57 : 'string' ;
+T58 : 'let' ;
+T59 : 'in' ;
+T60 : 'if' ;
+T61 : 'then' ;
+T62 : 'else' ;
+T63 : 'switch' ;
+T64 : 'default' ;
+T65 : 'case' ;
+T66 : '=>' ;
+T67 : '||' ;
+T68 : '&&' ;
+T69 : 'is' ;
+T70 : '.' ;
+T71 : '|' ;
+T72 : 'for' ;
+T73 : '$' ;
 T74 : 'begin' ;
 T75 : 'end' ;
 T76 : 'stateful' ;
 T77 : 'static' ;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17025
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17000
 RULE_ID : ('_'|'a'..'z'|'A'..'Z') ('0'..'9'|'_'|'a'..'z'|'A'..'Z')*;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17027
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17002
 RULE_STRING : '"' (~(('\\'|'"'))|'\\' ('\''|'"'|'?'|'\\'|'a'|'b'|'f'|'n'|'r'|'t'|'v'))* '"';
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17029
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17004
 RULE_REAL : ('0'..'9')+ '.' ('0'..'9')* (('e'|'E') ('+'|'-')? ('0'..'9')+)?;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17031
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17006
 RULE_INTEGER : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17033
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17008
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17035
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17010
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17037
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17012
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
-// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17039
+// $ANTLR src "../org.eclipselabs.mscript.language.ui/src-gen/org/eclipselabs/mscript/language/ui/contentassist/antlr/internal/InternalMscript.g" 17014
 RULE_ANY_OTHER : .;
 
 

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/Mscript.xmi

@@ -1215,10 +1215,7 @@
     <alternatives xsi:type="xtext:Group">
       <elements xsi:type="xtext:Keyword" value="."/>
       <elements xsi:type="xtext:Assignment" feature="identifier" operator="=">
-        <terminal xsi:type="xtext:Alternatives">
-          <elements xsi:type="xtext:RuleCall" rule="//@rules.85"/>
-          <elements xsi:type="xtext:Keyword" value="unit"/>
-        </terminal>
+        <terminal xsi:type="xtext:RuleCall" rule="//@rules.85"/>
       </elements>
     </alternatives>
   </rules>
@@ -1417,7 +1414,7 @@
       <classifier xsi:type="ecore:EClass" href="http://www.eclipselabs.org/mscript/AST/1.0.0#//UnitConstructionOperator"/>
     </type>
     <alternatives xsi:type="xtext:Group">
-      <elements xsi:type="xtext:Keyword" value="unit"/>
+      <elements xsi:type="xtext:Keyword" value="$"/>
       <elements xsi:type="xtext:Keyword" value="("/>
       <elements xsi:type="xtext:Assignment" feature="unit" operator="=">
         <terminal xsi:type="xtext:RuleCall" rule="//@rules.80"/>

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parseTreeConstruction/MscriptParsetreeConstructor.java

@@ -12971,11 +12971,11 @@ protected class FeatureCallPart_IterationCallParserRuleCall_3 extends RuleCallTo
 /************ begin Rule NameComponent ****************
  *
  * NameComponent:
- * 	"." identifier=(ID | "unit");
+ * 	"." identifier=ID;
  *
  **/
 
-// "." identifier=(ID | "unit")
+// "." identifier=ID
 protected class NameComponent_Group extends GroupToken {
 	
 	public NameComponent_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -13025,7 +13025,7 @@ protected class NameComponent_FullStopKeyword_0 extends KeywordToken  {
 
 }
 
-// identifier=(ID | "unit")
+// identifier=ID
 protected class NameComponent_IdentifierAssignment_1 extends AssignmentToken  {
 	
 	public NameComponent_IdentifierAssignment_1(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -13049,14 +13049,9 @@ protected class NameComponent_IdentifierAssignment_1 extends AssignmentToken  {
 	public IEObjectConsumer tryConsume() {
 		if((value = eObjectConsumer.getConsumable("identifier",true)) == null) return null;
 		IEObjectConsumer obj = eObjectConsumer.cloneAndConsume("identifier");
-		if(keywordSerializer.isValid(obj.getEObject(), grammarAccess.getNameComponentAccess().getIdentifierUnitKeyword_1_0_1(), value, null)) {
-			type = AssignmentType.KEYWORD;
-			element = grammarAccess.getNameComponentAccess().getIdentifierUnitKeyword_1_0_1();
-			return obj;
-		}
-		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0_0(), value, null)) {
+		if(valueSerializer.isValid(obj.getEObject(), grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0(), value, null)) {
 			type = AssignmentType.TERMINAL_RULE_CALL;
-			element = grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0_0();
+			element = grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0();
 			return obj;
 		}
 		return null;
@@ -15285,11 +15280,11 @@ protected class ExpressionList_ExpressionsAssignment_1_1 extends AssignmentToken
 /************ begin Rule UnitConstructionOperator ****************
  *
  * UnitConstructionOperator:
- * 	"unit" "(" unit=UnitExpression ")";
+ * 	"$" "(" unit=UnitExpression ")";
  *
  **/
 
-// "unit" "(" unit=UnitExpression ")"
+// "$" "(" unit=UnitExpression ")"
 protected class UnitConstructionOperator_Group extends GroupToken {
 	
 	public UnitConstructionOperator_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -15318,16 +15313,16 @@ protected class UnitConstructionOperator_Group extends GroupToken {
 
 }
 
-// "unit"
-protected class UnitConstructionOperator_UnitKeyword_0 extends KeywordToken  {
+// "$"
+protected class UnitConstructionOperator_DollarSignKeyword_0 extends KeywordToken  {
 	
-	public UnitConstructionOperator_UnitKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+	public UnitConstructionOperator_DollarSignKeyword_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
 		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
 	}
 	
 	@Override
 	public Keyword getGrammarElement() {
-		return grammarAccess.getUnitConstructionOperatorAccess().getUnitKeyword_0();
+		return grammarAccess.getUnitConstructionOperatorAccess().getDollarSignKeyword_0();
 	}
 
     @Override
@@ -15354,7 +15349,7 @@ protected class UnitConstructionOperator_LeftParenthesisKeyword_1 extends Keywor
     @Override
 	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
 		switch(index) {
-			case 0: return new UnitConstructionOperator_UnitKeyword_0(lastRuleCallOrigin, this, 0, inst);
+			case 0: return new UnitConstructionOperator_DollarSignKeyword_0(lastRuleCallOrigin, this, 0, inst);
 			default: return null;
 		}	
 	}

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g

@@ -5009,10 +5009,9 @@ ruleNameComponent returns [EObject current=null]
     }
 (
 (
-(
-		lv_identifier_1_1=RULE_ID
+		lv_identifier_1_0=RULE_ID
 		{
-			createLeafNode(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0_0(), "identifier"); 
+			createLeafNode(grammarAccess.getNameComponentAccess().getIdentifierIDTerminalRuleCall_1_0(), "identifier"); 
 		}
 		{
 	        if ($current==null) {
@@ -5023,7 +5022,7 @@ ruleNameComponent returns [EObject current=null]
 	       		set(
 	       			$current, 
 	       			"identifier",
-	        		lv_identifier_1_1, 
+	        		lv_identifier_1_0, 
 	        		"ID", 
 	        		lastConsumedNode);
 	        } catch (ValueConverterException vce) {
@@ -5031,26 +5030,6 @@ ruleNameComponent returns [EObject current=null]
 	        }
 	    }
 
-    |		lv_identifier_1_2=	'unit' 
-    {
-        createLeafNode(grammarAccess.getNameComponentAccess().getIdentifierUnitKeyword_1_0_1(), "identifier"); 
-    }
- 
-	    {
-	        if ($current==null) {
-	            $current = factory.create(grammarAccess.getNameComponentRule().getType().getClassifier());
-	            associateNodeWithAstElement(currentNode, $current);
-	        }
-	        
-	        try {
-	       		set($current, "identifier", lv_identifier_1_2, null, lastConsumedNode);
-	        } catch (ValueConverterException vce) {
-				handleValueConverterException(vce);
-	        }
-	    }
-
-)
-
 )
 ))
 ;
@@ -5983,9 +5962,9 @@ ruleUnitConstructionOperator returns [EObject current=null]
     @after { resetLookahead(); 
     	lastConsumedNode = currentNode;
     }:
-(	'unit' 
+(	'$' 
     {
-        createLeafNode(grammarAccess.getUnitConstructionOperatorAccess().getUnitKeyword_0(), null); 
+        createLeafNode(grammarAccess.getUnitConstructionOperatorAccess().getDollarSignKeyword_0(), null); 
     }
 	'(' 
     {

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.tokens

@@ -20,13 +20,14 @@ RULE_ML_COMMENT=8
 '&&'=50
 ';'=18
 'warning'=63
-'for'=55
+'for'=54
 '+'=70
 '=>'=48
 '.'=52
 'is'=51
 '^'=60
 'error'=64
+'$'=55
 'static'=28
 'true'=77
 'else'=44
@@ -50,13 +51,12 @@ RULE_ML_COMMENT=8
 'enum'=12
 '!'=74
 'assert'=29
-'|'=54
+'|'=53
 'begin'=56
 '.^'=73
 '.*'=71
 'info'=62
 '='=17
-'unit'=53
 'functor'=31
 ')'=26
 'bool'=38

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscriptLexer.java

@@ -864,11 +864,10 @@ public class InternalMscriptLexer extends Lexer {
     public final void mT53() throws RecognitionException {
         try {
             int _type = T53;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:51:5: ( 'unit' )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:51:7: 'unit'
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:51:5: ( '|' )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:51:7: '|'
             {
-            match("unit"); 
-
+            match('|'); 
 
             }
 
@@ -883,10 +882,11 @@ public class InternalMscriptLexer extends Lexer {
     public final void mT54() throws RecognitionException {
         try {
             int _type = T54;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:52:5: ( '|' )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:52:7: '|'
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:52:5: ( 'for' )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:52:7: 'for'
             {
-            match('|'); 
+            match("for"); 
+
 
             }
 
@@ -901,11 +901,10 @@ public class InternalMscriptLexer extends Lexer {
     public final void mT55() throws RecognitionException {
         try {
             int _type = T55;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:53:5: ( 'for' )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:53:7: 'for'
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:53:5: ( '$' )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:53:7: '$'
             {
-            match("for"); 
-
+            match('$'); 
 
             }
 
@@ -1331,8 +1330,8 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6919:9: ( ( '_' | 'a' .. 'z' | 'A' .. 'Z' ) ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )* )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6919:11: ( '_' | 'a' .. 'z' | 'A' .. 'Z' ) ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6898:9: ( ( '_' | 'a' .. 'z' | 'A' .. 'Z' ) ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )* )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6898:11: ( '_' | 'a' .. 'z' | 'A' .. 'Z' ) ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )*
             {
             if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
                 input.consume();
@@ -1344,7 +1343,7 @@ public class InternalMscriptLexer extends Lexer {
                 recover(mse);    throw mse;
             }
 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6919:35: ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6898:35: ( '0' .. '9' | '_' | 'a' .. 'z' | 'A' .. 'Z' )*
             loop1:
             do {
                 int alt1=2;
@@ -1392,11 +1391,11 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6921:13: ( '\"' (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )* '\"' )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6921:15: '\"' (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )* '\"'
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6900:13: ( '\"' (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )* '\"' )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6900:15: '\"' (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )* '\"'
             {
             match('\"'); 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6921:19: (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6900:19: (~ ( ( '\\\\' | '\"' ) ) | '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' ) )*
             loop2:
             do {
                 int alt2=3;
@@ -1412,7 +1411,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6921:20: ~ ( ( '\\\\' | '\"' ) )
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6900:20: ~ ( ( '\\\\' | '\"' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
             	        input.consume();
@@ -1428,7 +1427,7 @@ public class InternalMscriptLexer extends Lexer {
             	    }
             	    break;
             	case 2 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6921:34: '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' )
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6900:34: '\\\\' ( '\\'' | '\"' | '?' | '\\\\' | 'a' | 'b' | 'f' | 'n' | 'r' | 't' | 'v' )
             	    {
             	    match('\\'); 
             	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='?'||input.LA(1)=='\\'||(input.LA(1)>='a' && input.LA(1)<='b')||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t'||input.LA(1)=='v' ) {
@@ -1465,10 +1464,10 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_REAL() throws RecognitionException {
         try {
             int _type = RULE_REAL;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:11: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )? )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:13: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )?
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:11: ( ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )? )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:13: ( '0' .. '9' )+ '.' ( '0' .. '9' )* ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )?
             {
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:13: ( '0' .. '9' )+
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:13: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -1482,7 +1481,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt3) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:14: '0' .. '9'
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:14: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1499,7 +1498,7 @@ public class InternalMscriptLexer extends Lexer {
             } while (true);
 
             match('.'); 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:29: ( '0' .. '9' )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:29: ( '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -1512,7 +1511,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt4) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:30: '0' .. '9'
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:30: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1524,7 +1523,7 @@ public class InternalMscriptLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:41: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )?
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:41: ( ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+ )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -1533,7 +1532,7 @@ public class InternalMscriptLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:42: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
+                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:42: ( 'e' | 'E' ) ( '+' | '-' )? ( '0' .. '9' )+
                     {
                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                         input.consume();
@@ -1545,7 +1544,7 @@ public class InternalMscriptLexer extends Lexer {
                         recover(mse);    throw mse;
                     }
 
-                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:52: ( '+' | '-' )?
+                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:52: ( '+' | '-' )?
                     int alt5=2;
                     int LA5_0 = input.LA(1);
 
@@ -1572,7 +1571,7 @@ public class InternalMscriptLexer extends Lexer {
 
                     }
 
-                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:63: ( '0' .. '9' )+
+                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:63: ( '0' .. '9' )+
                     int cnt6=0;
                     loop6:
                     do {
@@ -1586,7 +1585,7 @@ public class InternalMscriptLexer extends Lexer {
 
                         switch (alt6) {
                     	case 1 :
-                    	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6923:64: '0' .. '9'
+                    	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6902:64: '0' .. '9'
                     	    {
                     	    matchRange('0','9'); 
 
@@ -1622,10 +1621,10 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_INTEGER() throws RecognitionException {
         try {
             int _type = RULE_INTEGER;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6925:14: ( ( '0' .. '9' )+ )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6925:16: ( '0' .. '9' )+
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6904:14: ( ( '0' .. '9' )+ )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6904:16: ( '0' .. '9' )+
             {
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6925:16: ( '0' .. '9' )+
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6904:16: ( '0' .. '9' )+
             int cnt8=0;
             loop8:
             do {
@@ -1639,7 +1638,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6925:17: '0' .. '9'
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6904:17: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1669,12 +1668,12 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6927:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6927:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6906:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6906:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6927:24: ( options {greedy=false; } : . )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6906:24: ( options {greedy=false; } : . )*
             loop9:
             do {
                 int alt9=2;
@@ -1699,7 +1698,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6927:52: .
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6906:52: .
             	    {
             	    matchAny(); 
 
@@ -1727,12 +1726,12 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_SL_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_SL_COMMENT;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop10:
             do {
                 int alt10=2;
@@ -1745,7 +1744,7 @@ public class InternalMscriptLexer extends Lexer {
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908: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)<='\uFFFE') ) {
             	        input.consume();
@@ -1766,7 +1765,7 @@ public class InternalMscriptLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:40: ( ( '\\r' )? '\\n' )?
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1775,9 +1774,9 @@ public class InternalMscriptLexer extends Lexer {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:41: ( '\\r' )? '\\n'
+                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:41: ( '\\r' )?
+                    // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:41: ( '\\r' )?
                     int alt11=2;
                     int LA11_0 = input.LA(1);
 
@@ -1786,7 +1785,7 @@ public class InternalMscriptLexer extends Lexer {
                     }
                     switch (alt11) {
                         case 1 :
-                            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6929:41: '\\r'
+                            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6908:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1816,10 +1815,10 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_WS() throws RecognitionException {
         try {
             int _type = RULE_WS;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6931:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6910:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6910:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6931:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6910:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt13=0;
             loop13:
             do {
@@ -1872,8 +1871,8 @@ public class InternalMscriptLexer extends Lexer {
     public final void mRULE_ANY_OTHER() throws RecognitionException {
         try {
             int _type = RULE_ANY_OTHER;
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6933:16: ( . )
-            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6933:18: .
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6912:16: ( . )
+            // ../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g:6912:18: .
             {
             matchAny(); 
 
@@ -2418,75 +2417,73 @@ public class InternalMscriptLexer extends Lexer {
     protected DFA14 dfa14 = new DFA14(this);
     static final String DFA14_eotS =
         "\1\uffff\1\56\3\uffff\1\56\1\67\1\uffff\1\56\1\uffff\2\56\1\101"+
-        "\1\103\2\uffff\1\107\2\56\2\uffff\6\56\1\127\1\52\1\134\1\56\1\140"+
-        "\2\uffff\1\56\1\145\3\uffff\1\52\1\151\2\uffff\3\56\4\uffff\3\56"+
-        "\4\uffff\1\56\1\uffff\5\56\10\uffff\2\56\2\uffff\1\u0081\1\u0082"+
-        "\1\u0083\7\56\7\uffff\1\56\5\uffff\1\56\6\uffff\1\151\2\uffff\1"+
-        "\56\1\u008e\12\56\1\u0099\4\56\1\u009e\1\u009f\1\56\3\uffff\5\56"+
-        "\1\u00a6\3\56\1\u00aa\1\uffff\1\56\1\u00ac\1\u00ad\1\u00ae\1\u00af"+
-        "\1\56\1\u00b1\3\56\1\uffff\2\56\1\u00b9\1\56\2\uffff\1\u00bb\1\u00bc"+
-        "\3\56\1\u00c0\1\uffff\1\56\1\u00c2\1\56\1\uffff\1\u00c4\4\uffff"+
-        "\1\56\1\uffff\4\56\1\u00ca\1\u00cb\1\56\1\uffff\1\56\2\uffff\1\56"+
-        "\1\u00cf\1\u00d0\1\uffff\1\56\1\uffff\1\56\1\uffff\1\u00d3\1\u00d4"+
-        "\1\56\1\u00d6\1\u00d7\2\uffff\1\56\1\u00d9\1\56\2\uffff\2\56\2\uffff"+
-        "\1\56\2\uffff\1\u00de\1\uffff\1\u00df\1\u00e0\1\u00e1\1\u00e2\5"+
-        "\uffff";
+        "\1\103\2\uffff\1\107\2\56\2\uffff\6\56\1\127\1\52\1\134\1\uffff"+
+        "\1\140\2\uffff\1\56\1\145\3\uffff\1\52\1\151\2\uffff\3\56\4\uffff"+
+        "\3\56\4\uffff\1\56\1\uffff\5\56\10\uffff\2\56\2\uffff\1\u0081\1"+
+        "\u0082\1\u0083\7\56\15\uffff\1\56\7\uffff\1\151\1\uffff\1\56\1\u008d"+
+        "\12\56\1\u0098\4\56\1\u009d\1\u009e\1\56\3\uffff\5\56\1\u00a5\2"+
+        "\56\1\u00a8\1\uffff\1\56\1\u00aa\1\u00ab\1\u00ac\1\u00ad\1\56\1"+
+        "\u00af\3\56\1\uffff\2\56\1\u00b7\1\56\2\uffff\1\u00b9\1\u00ba\3"+
+        "\56\1\u00be\1\uffff\2\56\1\uffff\1\u00c1\4\uffff\1\56\1\uffff\4"+
+        "\56\1\u00c7\1\u00c8\1\56\1\uffff\1\56\2\uffff\1\56\1\u00cc\1\u00cd"+
+        "\1\uffff\2\56\1\uffff\1\u00d0\1\56\1\u00d2\1\u00d3\1\u00d4\2\uffff"+
+        "\1\56\1\u00d6\1\56\2\uffff\2\56\1\uffff\1\56\3\uffff\1\u00db\1\uffff"+
+        "\1\u00dc\1\u00dd\1\u00de\1\u00df\5\uffff";
     static final String DFA14_eofS =
-        "\u00e3\uffff";
+        "\u00e0\uffff";
     static final String DFA14_minS =
         "\1\0\1\154\3\uffff\1\150\1\75\1\uffff\1\145\1\uffff\1\164\1\141"+
         "\2\75\2\uffff\1\76\1\163\1\141\2\uffff\1\146\2\141\3\145\1\174\1"+
-        "\46\1\52\1\156\1\52\2\uffff\1\141\1\75\3\uffff\1\0\1\56\2\uffff"+
+        "\46\1\52\1\uffff\1\52\2\uffff\1\141\1\75\3\uffff\1\0\1\56\2\uffff"+
         "\1\144\1\162\1\163\4\uffff\1\165\1\160\1\145\4\uffff\1\141\1\uffff"+
         "\1\141\1\151\1\162\1\154\1\156\10\uffff\1\163\1\162\2\uffff\3\60"+
-        "\1\163\1\155\1\165\1\147\1\157\1\164\1\146\7\uffff\1\151\5\uffff"+
-        "\1\162\6\uffff\1\56\2\uffff\1\155\1\60\1\157\3\145\1\156\1\157\1"+
-        "\154\1\164\1\151\1\164\1\60\1\163\1\141\1\143\1\145\2\60\1\157\3"+
-        "\uffff\1\145\1\160\1\163\1\151\1\154\1\60\1\141\1\164\1\156\1\60"+
-        "\1\uffff\1\162\4\60\1\162\1\60\1\145\1\156\1\143\1\uffff\1\145\1"+
-        "\154\1\60\1\162\2\uffff\2\60\1\154\1\163\1\156\1\60\1\uffff\1\165"+
-        "\1\60\1\151\1\uffff\1\60\4\uffff\1\144\1\uffff\1\143\1\146\1\147"+
-        "\1\150\2\60\1\157\1\uffff\1\164\2\uffff\1\145\2\60\1\uffff\1\154"+
-        "\1\uffff\1\156\1\uffff\2\60\1\165\2\60\2\uffff\1\162\1\60\1\170"+
-        "\2\uffff\1\164\1\147\2\uffff\1\154\2\uffff\1\60\1\uffff\4\60\5\uffff";
+        "\1\163\1\155\1\165\1\147\1\157\1\164\1\146\15\uffff\1\162\7\uffff"+
+        "\1\56\1\uffff\1\155\1\60\1\157\3\145\1\156\1\157\1\154\1\164\1\151"+
+        "\1\164\1\60\1\163\1\141\1\143\1\145\2\60\1\157\3\uffff\1\145\1\160"+
+        "\1\163\1\151\1\154\1\60\1\141\1\156\1\60\1\uffff\1\162\4\60\1\162"+
+        "\1\60\1\145\1\156\1\143\1\uffff\1\145\1\154\1\60\1\162\2\uffff\2"+
+        "\60\1\154\1\163\1\156\1\60\1\uffff\1\165\1\151\1\uffff\1\60\4\uffff"+
+        "\1\144\1\uffff\1\146\1\143\1\147\1\150\2\60\1\157\1\uffff\1\164"+
+        "\2\uffff\1\145\2\60\1\uffff\1\154\1\156\1\uffff\1\60\1\165\3\60"+
+        "\2\uffff\1\162\1\60\1\170\2\uffff\1\164\1\147\1\uffff\1\154\3\uffff"+
+        "\1\60\1\uffff\4\60\5\uffff";
     static final String DFA14_maxS =
         "\1\ufffe\1\162\3\uffff\1\171\1\76\1\uffff\1\145\1\uffff\1\167\1"+
         "\165\2\75\2\uffff\1\76\1\163\1\141\2\uffff\1\163\1\157\1\141\1\157"+
-        "\2\145\1\174\1\46\1\136\1\156\1\57\2\uffff\1\141\1\75\3\uffff\1"+
-        "\ufffe\1\71\2\uffff\1\165\1\162\1\163\4\uffff\1\165\1\160\1\145"+
+        "\2\145\1\174\1\46\1\136\1\uffff\1\57\2\uffff\1\141\1\75\3\uffff"+
+        "\1\ufffe\1\71\2\uffff\1\165\1\162\1\163\4\uffff\1\165\1\160\1\145"+
         "\4\uffff\1\143\1\uffff\1\162\1\151\1\162\1\164\1\156\10\uffff\1"+
         "\163\1\162\2\uffff\3\172\1\163\1\155\1\165\1\147\1\157\1\164\1\146"+
-        "\7\uffff\1\151\5\uffff\1\162\6\uffff\1\71\2\uffff\1\155\1\172\1"+
-        "\157\3\145\1\156\1\157\1\154\1\164\1\151\1\164\1\172\1\163\1\141"+
-        "\1\143\1\145\2\172\1\157\3\uffff\1\145\1\160\1\163\1\151\1\154\1"+
-        "\172\1\141\1\164\1\156\1\172\1\uffff\1\162\4\172\1\162\1\172\1\151"+
-        "\1\156\1\143\1\uffff\1\145\1\154\1\172\1\162\2\uffff\2\172\1\154"+
-        "\1\163\1\156\1\172\1\uffff\1\165\1\172\1\151\1\uffff\1\172\4\uffff"+
-        "\1\144\1\uffff\1\143\1\146\1\147\1\150\2\172\1\157\1\uffff\1\164"+
-        "\2\uffff\1\145\2\172\1\uffff\1\154\1\uffff\1\156\1\uffff\2\172\1"+
-        "\165\2\172\2\uffff\1\162\1\172\1\170\2\uffff\1\164\1\147\2\uffff"+
-        "\1\154\2\uffff\1\172\1\uffff\4\172\5\uffff";
+        "\15\uffff\1\162\7\uffff\1\71\1\uffff\1\155\1\172\1\157\3\145\1\156"+
+        "\1\157\1\154\1\164\1\151\1\164\1\172\1\163\1\141\1\143\1\145\2\172"+
+        "\1\157\3\uffff\1\145\1\160\1\163\1\151\1\154\1\172\1\141\1\156\1"+
+        "\172\1\uffff\1\162\4\172\1\162\1\172\1\151\1\156\1\143\1\uffff\1"+
+        "\145\1\154\1\172\1\162\2\uffff\2\172\1\154\1\163\1\156\1\172\1\uffff"+
+        "\1\165\1\151\1\uffff\1\172\4\uffff\1\144\1\uffff\1\146\1\143\1\147"+
+        "\1\150\2\172\1\157\1\uffff\1\164\2\uffff\1\145\2\172\1\uffff\1\154"+
+        "\1\156\1\uffff\1\172\1\165\3\172\2\uffff\1\162\1\172\1\170\2\uffff"+
+        "\1\164\1\147\1\uffff\1\154\3\uffff\1\172\1\uffff\4\172\5\uffff";
     static final String DFA14_acceptS =
         "\2\uffff\1\2\1\3\1\4\2\uffff\1\7\1\uffff\1\11\4\uffff\1\16\1\17"+
-        "\3\uffff\1\26\1\27\13\uffff\1\60\1\61\2\uffff\1\73\1\100\1\103\2"+
-        "\uffff\1\111\1\112\3\uffff\1\103\1\2\1\3\1\4\3\uffff\1\45\1\67\1"+
-        "\6\1\7\1\uffff\1\11\5\uffff\1\71\1\14\1\72\1\15\1\16\1\17\1\20\1"+
-        "\62\2\uffff\1\26\1\27\12\uffff\1\46\1\53\1\47\1\74\1\75\1\76\1\51"+
-        "\1\uffff\1\110\1\107\1\57\1\60\1\61\1\uffff\1\70\1\77\1\73\1\100"+
-        "\1\104\1\106\1\uffff\1\105\1\111\24\uffff\1\36\1\50\1\37\12\uffff"+
-        "\1\56\12\uffff\1\54\4\uffff\1\23\1\30\6\uffff\1\35\3\uffff\1\1\1"+
-        "\uffff\1\41\1\102\1\5\1\40\1\uffff\1\25\7\uffff\1\13\1\uffff\1\63"+
-        "\1\44\3\uffff\1\33\1\uffff\1\52\1\uffff\1\65\5\uffff\1\101\1\66"+
-        "\3\uffff\1\32\1\55\2\uffff\1\10\1\21\1\uffff\1\34\1\42\1\uffff\1"+
+        "\3\uffff\1\26\1\27\11\uffff\1\54\1\uffff\1\60\1\61\2\uffff\1\73"+
+        "\1\100\1\103\2\uffff\1\111\1\112\3\uffff\1\103\1\2\1\3\1\4\3\uffff"+
+        "\1\45\1\67\1\6\1\7\1\uffff\1\11\5\uffff\1\71\1\14\1\72\1\15\1\16"+
+        "\1\17\1\20\1\62\2\uffff\1\26\1\27\12\uffff\1\46\1\52\1\47\1\75\1"+
+        "\76\1\74\1\51\1\54\1\110\1\107\1\57\1\60\1\61\1\uffff\1\70\1\77"+
+        "\1\73\1\100\1\104\1\106\1\105\1\uffff\1\111\24\uffff\1\36\1\50\1"+
+        "\37\11\uffff\1\56\12\uffff\1\53\4\uffff\1\23\1\30\6\uffff\1\35\2"+
+        "\uffff\1\1\1\uffff\1\41\1\102\1\5\1\40\1\uffff\1\25\7\uffff\1\13"+
+        "\1\uffff\1\63\1\44\3\uffff\1\33\2\uffff\1\65\5\uffff\1\101\1\66"+
+        "\3\uffff\1\32\1\55\2\uffff\1\10\1\uffff\1\21\1\34\1\42\1\uffff\1"+
         "\22\4\uffff\1\24\1\31\1\43\1\64\1\12";
     static final String DFA14_specialS =
-        "\u00e3\uffff}>";
+        "\u00e0\uffff}>";
     static final String[] DFA14_transitionS = {
-            "\11\52\2\51\2\52\1\51\22\52\1\51\1\43\1\47\3\52\1\34\1\45\1"+
-            "\16\1\17\1\40\1\44\1\3\1\20\1\35\1\37\12\50\1\11\1\7\1\14\1"+
-            "\6\1\15\2\52\32\46\1\23\1\52\1\24\1\41\1\46\1\52\1\21\1\30\1"+
-            "\26\1\32\1\1\1\13\1\27\1\46\1\25\2\46\1\31\5\46\1\10\1\12\1"+
-            "\5\1\36\1\22\1\42\3\46\1\2\1\33\1\4\uff81\52",
+            "\11\52\2\51\2\52\1\51\22\52\1\51\1\43\1\47\1\52\1\36\1\52\1"+
+            "\34\1\45\1\16\1\17\1\40\1\44\1\3\1\20\1\35\1\37\12\50\1\11\1"+
+            "\7\1\14\1\6\1\15\2\52\32\46\1\23\1\52\1\24\1\41\1\46\1\52\1"+
+            "\21\1\30\1\26\1\32\1\1\1\13\1\27\1\46\1\25\2\46\1\31\5\46\1"+
+            "\10\1\12\1\5\1\46\1\22\1\42\3\46\1\2\1\33\1\4\uff81\52",
             "\1\55\1\uffff\1\53\3\uffff\1\54",
             "",
             "",
@@ -2515,8 +2512,8 @@ public class InternalMscriptLexer extends Lexer {
             "\1\125",
             "\1\126",
             "\1\130",
-            "\1\131\4\uffff\1\132\56\uffff\1\133",
-            "\1\135",
+            "\1\133\4\uffff\1\131\56\uffff\1\132",
+            "",
             "\1\137\4\uffff\1\136",
             "",
             "",
@@ -2526,7 +2523,7 @@ public class InternalMscriptLexer extends Lexer {
             "",
             "",
             "\uffff\150",
-            "\1\153\1\uffff\12\152",
+            "\1\152\1\uffff\12\153",
             "",
             "",
             "\1\156\20\uffff\1\155",
@@ -2580,24 +2577,25 @@ public class InternalMscriptLexer extends Lexer {
             "",
             "",
             "",
-            "\1\u008b",
             "",
             "",
             "",
             "",
             "",
-            "\1\u008c",
+            "",
+            "\1\u008b",
             "",
             "",
             "",
             "",
             "",
             "",
-            "\1\153\1\uffff\12\152",
             "",
+            "\1\152\1\uffff\12\153",
             "",
-            "\1\u008d",
+            "\1\u008c",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u008e",
             "\1\u008f",
             "\1\u0090",
             "\1\u0091",
@@ -2607,100 +2605,96 @@ public class InternalMscriptLexer extends Lexer {
             "\1\u0095",
             "\1\u0096",
             "\1\u0097",
-            "\1\u0098",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u0099",
             "\1\u009a",
             "\1\u009b",
             "\1\u009c",
-            "\1\u009d",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00a0",
+            "\1\u009f",
             "",
             "",
             "",
+            "\1\u00a0",
             "\1\u00a1",
             "\1\u00a2",
             "\1\u00a3",
             "\1\u00a4",
-            "\1\u00a5",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00a6",
             "\1\u00a7",
-            "\1\u00a8",
-            "\1\u00a9",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
-            "\1\u00ab",
+            "\1\u00a9",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00b0",
+            "\1\u00ae",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00b3\3\uffff\1\u00b2",
+            "\1\u00b0\3\uffff\1\u00b1",
+            "\1\u00b2",
+            "\1\u00b3",
+            "",
             "\1\u00b4",
             "\1\u00b5",
-            "",
-            "\1\u00b6",
-            "\1\u00b7",
-            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\23\56\1\u00b8\6\56",
-            "\1\u00ba",
+            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\23\56\1\u00b6\6\56",
+            "\1\u00b8",
             "",
             "",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00bb",
+            "\1\u00bc",
             "\1\u00bd",
-            "\1\u00be",
-            "\1\u00bf",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
-            "\1\u00c1",
-            "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00c3",
+            "\1\u00bf",
+            "\1\u00c0",
             "",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
             "",
             "",
             "",
-            "\1\u00c5",
+            "\1\u00c2",
             "",
+            "\1\u00c3",
+            "\1\u00c4",
+            "\1\u00c5",
             "\1\u00c6",
-            "\1\u00c7",
-            "\1\u00c8",
-            "\1\u00c9",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00cc",
+            "\1\u00c9",
             "",
-            "\1\u00cd",
+            "\1\u00ca",
             "",
             "",
-            "\1\u00ce",
+            "\1\u00cb",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
-            "\1\u00d1",
-            "",
-            "\1\u00d2",
+            "\1\u00ce",
+            "\1\u00cf",
             "",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
+            "\1\u00d1",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00d5",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
             "",
             "",
-            "\1\u00d8",
+            "\1\u00d5",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",
-            "\1\u00da",
+            "\1\u00d7",
             "",
             "",
-            "\1\u00db",
-            "\1\u00dc",
+            "\1\u00d8",
+            "\1\u00d9",
             "",
+            "\1\u00da",
             "",
-            "\1\u00dd",
             "",
             "",
             "\12\56\7\uffff\32\56\4\uffff\1\56\1\uffff\32\56",

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript__.g

@@ -48,9 +48,9 @@ T49 : '||' ;
 T50 : '&&' ;
 T51 : 'is' ;
 T52 : '.' ;
-T53 : 'unit' ;
-T54 : '|' ;
-T55 : 'for' ;
+T53 : '|' ;
+T54 : 'for' ;
+T55 : '$' ;
 T56 : 'begin' ;
 T57 : 'end' ;
 T58 : '/' ;
@@ -74,28 +74,28 @@ T75 : '\'' ;
 T76 : 'false' ;
 T77 : 'true' ;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6919
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6898
 RULE_ID : ('_'|'a'..'z'|'A'..'Z') ('0'..'9'|'_'|'a'..'z'|'A'..'Z')*;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6921
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6900
 RULE_STRING : '"' (~(('\\'|'"'))|'\\' ('\''|'"'|'?'|'\\'|'a'|'b'|'f'|'n'|'r'|'t'|'v'))* '"';
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6923
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6902
 RULE_REAL : ('0'..'9')+ '.' ('0'..'9')* (('e'|'E') ('+'|'-')? ('0'..'9')+)?;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6925
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6904
 RULE_INTEGER : ('0'..'9')+;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6927
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6906
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6929
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6908
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6931
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6910
 RULE_WS : (' '|'\t'|'\r'|'\n')+;
 
-// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6933
+// $ANTLR src "../org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/parser/antlr/internal/InternalMscript.g" 6912
 RULE_ANY_OTHER : .;
 
 

plugins/org.eclipselabs.mscript.language/src-gen/org/eclipselabs/mscript/language/services/MscriptGrammarAccess.java

@@ -2428,31 +2428,23 @@ public class MscriptGrammarAccess extends AbstractGrammarElementFinder {
 		private final Group cGroup = (Group)rule.eContents().get(1);
 		private final Keyword cFullStopKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Assignment cIdentifierAssignment_1 = (Assignment)cGroup.eContents().get(1);
-		private final Alternatives cIdentifierAlternatives_1_0 = (Alternatives)cIdentifierAssignment_1.eContents().get(0);
-		private final RuleCall cIdentifierIDTerminalRuleCall_1_0_0 = (RuleCall)cIdentifierAlternatives_1_0.eContents().get(0);
-		private final Keyword cIdentifierUnitKeyword_1_0_1 = (Keyword)cIdentifierAlternatives_1_0.eContents().get(1);
+		private final RuleCall cIdentifierIDTerminalRuleCall_1_0 = (RuleCall)cIdentifierAssignment_1.eContents().get(0);
 		
 		//NameComponent:
-		//	"." identifier=(ID | "unit");
+		//	"." identifier=ID;
 		public ParserRule getRule() { return rule; }
 
-		//"." identifier=(ID | "unit")
+		//"." identifier=ID
 		public Group getGroup() { return cGroup; }
 
 		//"."
 		public Keyword getFullStopKeyword_0() { return cFullStopKeyword_0; }
 
-		//identifier=(ID | "unit")
+		//identifier=ID
 		public Assignment getIdentifierAssignment_1() { return cIdentifierAssignment_1; }
 
-		//ID | "unit"
-		public Alternatives getIdentifierAlternatives_1_0() { return cIdentifierAlternatives_1_0; }
-
 		//ID
-		public RuleCall getIdentifierIDTerminalRuleCall_1_0_0() { return cIdentifierIDTerminalRuleCall_1_0_0; }
-
-		//"unit"
-		public Keyword getIdentifierUnitKeyword_1_0_1() { return cIdentifierUnitKeyword_1_0_1; }
+		public RuleCall getIdentifierIDTerminalRuleCall_1_0() { return cIdentifierIDTerminalRuleCall_1_0; }
 	}
 
 	public class ArrayElementAccessElements extends AbstractParserRuleElementFinder {
@@ -2911,21 +2903,21 @@ public class MscriptGrammarAccess extends AbstractGrammarElementFinder {
 	public class UnitConstructionOperatorElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "UnitConstructionOperator");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword cUnitKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Keyword cDollarSignKeyword_0 = (Keyword)cGroup.eContents().get(0);
 		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		private final Assignment cUnitAssignment_2 = (Assignment)cGroup.eContents().get(2);
 		private final RuleCall cUnitUnitExpressionParserRuleCall_2_0 = (RuleCall)cUnitAssignment_2.eContents().get(0);
 		private final Keyword cRightParenthesisKeyword_3 = (Keyword)cGroup.eContents().get(3);
 		
 		//UnitConstructionOperator:
-		//	"unit" "(" unit=UnitExpression ")";
+		//	"$" "(" unit=UnitExpression ")";
 		public ParserRule getRule() { return rule; }
 
-		//"unit" "(" unit=UnitExpression ")"
+		//"$" "(" unit=UnitExpression ")"
 		public Group getGroup() { return cGroup; }
 
-		//"unit"
-		public Keyword getUnitKeyword_0() { return cUnitKeyword_0; }
+		//"$"
+		public Keyword getDollarSignKeyword_0() { return cDollarSignKeyword_0; }
 
 		//"("
 		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
@@ -4344,7 +4336,7 @@ public class MscriptGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//NameComponent:
-	//	"." identifier=(ID | "unit");
+	//	"." identifier=ID;
 	public NameComponentElements getNameComponentAccess() {
 		return (pNameComponent != null) ? pNameComponent : (pNameComponent = new NameComponentElements());
 	}
@@ -4456,7 +4448,7 @@ public class MscriptGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//UnitConstructionOperator:
-	//	"unit" "(" unit=UnitExpression ")";
+	//	"$" "(" unit=UnitExpression ")";
 	public UnitConstructionOperatorElements getUnitConstructionOperatorAccess() {
 		return (pUnitConstructionOperator != null) ? pUnitConstructionOperator : (pUnitConstructionOperator = new UnitConstructionOperatorElements());
 	}

plugins/org.eclipselabs.mscript.language/src/org/eclipselabs/mscript/language/Mscript.xtext

@@ -273,7 +273,7 @@ FeatureCallPart :
 	NameComponent | ArrayElementAccess | OperationArgumentList | IterationCall;
 	
 NameComponent :
-	'.' identifier=(ID | 'unit');
+	'.' identifier=ID;
 	
 ArrayElementAccess :
 	'[' subscripts+=ArraySubscript (',' subscripts+=ArraySubscript)* ']';
@@ -306,7 +306,7 @@ ExpressionList :
 	expressions+=Expression (',' expressions+=Expression)*;
 	
 UnitConstructionOperator :
-	'unit' '(' unit=UnitExpression ')';
+	'$' '(' unit=UnitExpression ')';
 
 ParenthesizedExpression :
 	'(' expressions+=Expression (',' expressions+=Expression)* ')';