cariboujs 2.0.7 → 2.0.9

package/asm/asmZ80/asmZ80Parser.js

@@ -4,49 +4,55 @@ import antlr4 from 'antlr4';
 import asmZ80Listener from './asmZ80Listener.js';
 import asmZ80Visitor from './asmZ80Visitor.js';
 
-const serializedATN = [4,1,18,146,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
+const serializedATN = [4,1,20,160,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
 4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,
-2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,1,0,5,0,38,8,0,10,0,12,
-0,41,9,0,1,0,1,0,1,0,5,0,46,8,0,10,0,12,0,49,9,0,1,0,1,0,5,0,53,8,0,10,0,
-12,0,56,9,0,3,0,58,8,0,1,0,1,0,1,1,3,1,63,8,1,1,1,1,1,3,1,67,8,1,1,1,3,1,
-70,8,1,1,1,1,1,3,1,74,8,1,1,1,3,1,77,8,1,1,2,1,2,3,2,81,8,2,1,3,1,3,1,4,
-1,4,1,5,3,5,88,8,5,1,5,1,5,1,5,1,6,1,6,1,7,1,7,3,7,97,8,7,1,8,1,8,1,8,5,
-8,102,8,8,10,8,12,8,105,9,8,1,9,1,9,1,10,1,10,1,10,5,10,112,8,10,10,10,12,
-10,115,9,10,1,11,1,11,1,11,5,11,120,8,11,10,11,12,11,123,9,11,1,12,1,12,
-1,12,1,12,1,12,1,12,1,12,1,12,1,12,3,12,134,8,12,1,13,1,13,1,14,1,14,1,15,
-1,15,1,16,1,16,1,17,1,17,1,17,0,0,18,0,2,4,6,8,10,12,14,16,18,20,22,24,26,
-28,30,32,34,0,2,1,0,3,4,1,0,5,6,148,0,39,1,0,0,0,2,76,1,0,0,0,4,78,1,0,0,
-0,6,82,1,0,0,0,8,84,1,0,0,0,10,87,1,0,0,0,12,92,1,0,0,0,14,94,1,0,0,0,16,
-98,1,0,0,0,18,106,1,0,0,0,20,108,1,0,0,0,22,116,1,0,0,0,24,133,1,0,0,0,26,
-135,1,0,0,0,28,137,1,0,0,0,30,139,1,0,0,0,32,141,1,0,0,0,34,143,1,0,0,0,
-36,38,5,17,0,0,37,36,1,0,0,0,38,41,1,0,0,0,39,37,1,0,0,0,39,40,1,0,0,0,40,
-57,1,0,0,0,41,39,1,0,0,0,42,43,3,2,1,0,43,44,5,17,0,0,44,46,1,0,0,0,45,42,
-1,0,0,0,46,49,1,0,0,0,47,45,1,0,0,0,47,48,1,0,0,0,48,50,1,0,0,0,49,47,1,
-0,0,0,50,54,3,2,1,0,51,53,5,17,0,0,52,51,1,0,0,0,53,56,1,0,0,0,54,52,1,0,
-0,0,54,55,1,0,0,0,55,58,1,0,0,0,56,54,1,0,0,0,57,47,1,0,0,0,57,58,1,0,0,
-0,58,59,1,0,0,0,59,60,5,0,0,1,60,1,1,0,0,0,61,63,3,14,7,0,62,61,1,0,0,0,
-62,63,1,0,0,0,63,66,1,0,0,0,64,67,3,4,2,0,65,67,3,10,5,0,66,64,1,0,0,0,66,
-65,1,0,0,0,67,69,1,0,0,0,68,70,3,34,17,0,69,68,1,0,0,0,69,70,1,0,0,0,70,
-77,1,0,0,0,71,73,3,14,7,0,72,74,3,34,17,0,73,72,1,0,0,0,73,74,1,0,0,0,74,
-77,1,0,0,0,75,77,3,34,17,0,76,62,1,0,0,0,76,71,1,0,0,0,76,75,1,0,0,0,77,
-3,1,0,0,0,78,80,3,6,3,0,79,81,3,16,8,0,80,79,1,0,0,0,80,81,1,0,0,0,81,5,
-1,0,0,0,82,83,5,12,0,0,83,7,1,0,0,0,84,85,5,10,0,0,85,9,1,0,0,0,86,88,3,
-24,12,0,87,86,1,0,0,0,87,88,1,0,0,0,88,89,1,0,0,0,89,90,3,12,6,0,90,91,3,
-16,8,0,91,11,1,0,0,0,92,93,5,11,0,0,93,13,1,0,0,0,94,96,3,18,9,0,95,97,5,
-1,0,0,96,95,1,0,0,0,96,97,1,0,0,0,97,15,1,0,0,0,98,103,3,20,10,0,99,100,
-5,2,0,0,100,102,3,20,10,0,101,99,1,0,0,0,102,105,1,0,0,0,103,101,1,0,0,0,
-103,104,1,0,0,0,104,17,1,0,0,0,105,103,1,0,0,0,106,107,3,30,15,0,107,19,
-1,0,0,0,108,113,3,22,11,0,109,110,7,0,0,0,110,112,3,22,11,0,111,109,1,0,
-0,0,112,115,1,0,0,0,113,111,1,0,0,0,113,114,1,0,0,0,114,21,1,0,0,0,115,113,
-1,0,0,0,116,121,3,24,12,0,117,118,7,1,0,0,118,120,3,24,12,0,119,117,1,0,
-0,0,120,123,1,0,0,0,121,119,1,0,0,0,121,122,1,0,0,0,122,23,1,0,0,0,123,121,
-1,0,0,0,124,134,3,32,16,0,125,134,3,8,4,0,126,134,3,26,13,0,127,134,3,30,
-15,0,128,134,3,28,14,0,129,130,5,7,0,0,130,131,3,20,10,0,131,132,5,8,0,0,
-132,134,1,0,0,0,133,124,1,0,0,0,133,125,1,0,0,0,133,126,1,0,0,0,133,127,
-1,0,0,0,133,128,1,0,0,0,133,129,1,0,0,0,134,25,1,0,0,0,135,136,5,9,0,0,136,
-27,1,0,0,0,137,138,5,16,0,0,138,29,1,0,0,0,139,140,5,13,0,0,140,31,1,0,0,
-0,141,142,5,14,0,0,142,33,1,0,0,0,143,144,5,15,0,0,144,35,1,0,0,0,16,39,
-47,54,57,62,66,69,73,76,80,87,96,103,113,121,133];
+2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,1,0,5,0,40,8,
+0,10,0,12,0,43,9,0,1,0,1,0,4,0,47,8,0,11,0,12,0,48,5,0,51,8,0,10,0,12,0,
+54,9,0,1,0,1,0,5,0,58,8,0,10,0,12,0,61,9,0,3,0,63,8,0,1,0,1,0,1,1,3,1,68,
+8,1,1,1,1,1,1,1,3,1,73,8,1,1,1,3,1,76,8,1,1,1,1,1,3,1,80,8,1,1,1,3,1,83,
+8,1,1,2,1,2,3,2,87,8,2,1,3,1,3,1,4,1,4,1,5,3,5,94,8,5,1,5,1,5,3,5,98,8,5,
+1,6,1,6,1,7,1,7,3,7,104,8,7,1,8,1,8,3,8,108,8,8,1,9,1,9,1,9,5,9,113,8,9,
+10,9,12,9,116,9,9,1,10,1,10,1,11,3,11,121,8,11,1,11,1,11,1,11,5,11,126,8,
+11,10,11,12,11,129,9,11,1,12,1,12,1,12,5,12,134,8,12,10,12,12,12,137,9,12,
+1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,3,13,148,8,13,1,14,1,14,1,15,
+1,15,1,16,1,16,1,17,1,17,1,18,1,18,1,18,0,0,19,0,2,4,6,8,10,12,14,16,18,
+20,22,24,26,28,30,32,34,36,0,4,1,0,3,4,1,0,5,6,1,0,16,17,1,0,11,13,166,0,
+41,1,0,0,0,2,82,1,0,0,0,4,84,1,0,0,0,6,88,1,0,0,0,8,90,1,0,0,0,10,93,1,0,
+0,0,12,99,1,0,0,0,14,101,1,0,0,0,16,105,1,0,0,0,18,109,1,0,0,0,20,117,1,
+0,0,0,22,120,1,0,0,0,24,130,1,0,0,0,26,147,1,0,0,0,28,149,1,0,0,0,30,151,
+1,0,0,0,32,153,1,0,0,0,34,155,1,0,0,0,36,157,1,0,0,0,38,40,5,19,0,0,39,38,
+1,0,0,0,40,43,1,0,0,0,41,39,1,0,0,0,41,42,1,0,0,0,42,62,1,0,0,0,43,41,1,
+0,0,0,44,46,3,2,1,0,45,47,5,19,0,0,46,45,1,0,0,0,47,48,1,0,0,0,48,46,1,0,
+0,0,48,49,1,0,0,0,49,51,1,0,0,0,50,44,1,0,0,0,51,54,1,0,0,0,52,50,1,0,0,
+0,52,53,1,0,0,0,53,55,1,0,0,0,54,52,1,0,0,0,55,59,3,2,1,0,56,58,5,19,0,0,
+57,56,1,0,0,0,58,61,1,0,0,0,59,57,1,0,0,0,59,60,1,0,0,0,60,63,1,0,0,0,61,
+59,1,0,0,0,62,52,1,0,0,0,62,63,1,0,0,0,63,64,1,0,0,0,64,65,5,0,0,1,65,1,
+1,0,0,0,66,68,3,16,8,0,67,66,1,0,0,0,67,68,1,0,0,0,68,72,1,0,0,0,69,73,3,
+4,2,0,70,73,3,10,5,0,71,73,3,14,7,0,72,69,1,0,0,0,72,70,1,0,0,0,72,71,1,
+0,0,0,73,75,1,0,0,0,74,76,3,36,18,0,75,74,1,0,0,0,75,76,1,0,0,0,76,83,1,
+0,0,0,77,79,3,16,8,0,78,80,3,36,18,0,79,78,1,0,0,0,79,80,1,0,0,0,80,83,1,
+0,0,0,81,83,3,36,18,0,82,67,1,0,0,0,82,77,1,0,0,0,82,81,1,0,0,0,83,3,1,0,
+0,0,84,86,3,6,3,0,85,87,3,18,9,0,86,85,1,0,0,0,86,87,1,0,0,0,87,5,1,0,0,
+0,88,89,5,12,0,0,89,7,1,0,0,0,90,91,5,10,0,0,91,9,1,0,0,0,92,94,3,26,13,
+0,93,92,1,0,0,0,93,94,1,0,0,0,94,95,1,0,0,0,95,97,3,12,6,0,96,98,3,18,9,
+0,97,96,1,0,0,0,97,98,1,0,0,0,98,11,1,0,0,0,99,100,5,11,0,0,100,13,1,0,0,
+0,101,103,5,13,0,0,102,104,3,18,9,0,103,102,1,0,0,0,103,104,1,0,0,0,104,
+15,1,0,0,0,105,107,3,20,10,0,106,108,5,1,0,0,107,106,1,0,0,0,107,108,1,0,
+0,0,108,17,1,0,0,0,109,114,3,22,11,0,110,111,5,2,0,0,111,113,3,22,11,0,112,
+110,1,0,0,0,113,116,1,0,0,0,114,112,1,0,0,0,114,115,1,0,0,0,115,19,1,0,0,
+0,116,114,1,0,0,0,117,118,3,32,16,0,118,21,1,0,0,0,119,121,5,3,0,0,120,119,
+1,0,0,0,120,121,1,0,0,0,121,122,1,0,0,0,122,127,3,24,12,0,123,124,7,0,0,
+0,124,126,3,24,12,0,125,123,1,0,0,0,126,129,1,0,0,0,127,125,1,0,0,0,127,
+128,1,0,0,0,128,23,1,0,0,0,129,127,1,0,0,0,130,135,3,26,13,0,131,132,7,1,
+0,0,132,134,3,26,13,0,133,131,1,0,0,0,134,137,1,0,0,0,135,133,1,0,0,0,135,
+136,1,0,0,0,136,25,1,0,0,0,137,135,1,0,0,0,138,148,3,34,17,0,139,148,3,8,
+4,0,140,148,3,28,14,0,141,148,3,32,16,0,142,148,3,30,15,0,143,144,5,7,0,
+0,144,145,3,22,11,0,145,146,5,8,0,0,146,148,1,0,0,0,147,138,1,0,0,0,147,
+139,1,0,0,0,147,140,1,0,0,0,147,141,1,0,0,0,147,142,1,0,0,0,147,143,1,0,
+0,0,148,27,1,0,0,0,149,150,5,9,0,0,150,29,1,0,0,0,151,152,7,2,0,0,152,31,
+1,0,0,0,153,154,7,3,0,0,154,33,1,0,0,0,155,156,5,14,0,0,156,35,1,0,0,0,157,
+158,5,15,0,0,158,37,1,0,0,0,20,41,48,52,59,62,67,72,75,79,82,86,93,97,103,
+107,114,120,127,135,147];
 
 
 const atn = new antlr4.atn.ATNDeserializer().deserialize(serializedATN);
@@ -58,17 +64,17 @@ const sharedContextCache = new antlr4.atn.PredictionContextCache();
 export default class asmZ80Parser extends antlr4.Parser {
 
     static grammarFileName = "asmZ80.g4";
-    static literalNames = [ null, "':'", "','", "'+'", "'-'", "'*'", "'/'", 
+    static literalNames = [ null, "':'", "','", "'-'", "'+'", "'*'", "'/'", 
                             "'('", "')'", "'$'" ];
     static symbolicNames = [ null, null, null, null, null, null, null, null, 
                              null, null, "REGISTER", "ASSEMBLER_DIRECTIVE", 
                              "OPCODE", "NAME", "NUMBER", "COMMENT", "STRING", 
-                             "EOL", "WS" ];
+                             "DOUBLE_STRING", "METADATA", "EOL", "WS" ];
     static ruleNames = [ "prog", "line", "instruction", "opcode", "register_", 
-                         "directive", "assemblerdirective", "lbl", "expressionlist", 
-                         "label", "expression", "multiplyingExpression", 
-                         "argument", "dollar", "string_", "name", "number", 
-                         "comment" ];
+                         "directive", "assemblerdirective", "macrocall", 
+                         "lbl", "expressionlist", "label", "expression", 
+                         "multiplyingExpression", "argument", "dollar", 
+                         "string_", "name", "number", "comment" ];
 
     constructor(input) {
         super(input);
@@ -86,50 +92,58 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 39;
+	        this.state = 41;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        while(_la===17) {
-	            this.state = 36;
+	        while(_la===19) {
+	            this.state = 38;
 	            this.match(asmZ80Parser.EOL);
-	            this.state = 41;
+	            this.state = 43;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	        }
-	        this.state = 57;
+	        this.state = 62;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 130688) !== 0)) {
-	            this.state = 47;
+	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 261760) !== 0)) {
+	            this.state = 52;
 	            this._errHandler.sync(this);
-	            var _alt = this._interp.adaptivePredict(this._input,1,this._ctx)
+	            var _alt = this._interp.adaptivePredict(this._input,2,this._ctx)
 	            while(_alt!=2 && _alt!=antlr4.atn.ATN.INVALID_ALT_NUMBER) {
 	                if(_alt===1) {
-	                    this.state = 42;
+	                    this.state = 44;
 	                    this.line();
-	                    this.state = 43;
-	                    this.match(asmZ80Parser.EOL); 
+	                    this.state = 46; 
+	                    this._errHandler.sync(this);
+	                    _la = this._input.LA(1);
+	                    do {
+	                        this.state = 45;
+	                        this.match(asmZ80Parser.EOL);
+	                        this.state = 48; 
+	                        this._errHandler.sync(this);
+	                        _la = this._input.LA(1);
+	                    } while(_la===19); 
 	                }
-	                this.state = 49;
+	                this.state = 54;
 	                this._errHandler.sync(this);
-	                _alt = this._interp.adaptivePredict(this._input,1,this._ctx);
+	                _alt = this._interp.adaptivePredict(this._input,2,this._ctx);
 	            }
 
-	            this.state = 50;
+	            this.state = 55;
 	            this.line();
-	            this.state = 54;
+	            this.state = 59;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
-	            while(_la===17) {
-	                this.state = 51;
-	                this.match(asmZ80Parser.EOL);
+	            while(_la===19) {
 	                this.state = 56;
+	                this.match(asmZ80Parser.EOL);
+	                this.state = 61;
 	                this._errHandler.sync(this);
 	                _la = this._input.LA(1);
 	            }
 	        }
 
-	        this.state = 59;
+	        this.state = 64;
 	        this.match(asmZ80Parser.EOF);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -152,45 +166,45 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    this.enterRule(localctx, 2, asmZ80Parser.RULE_line);
 	    var _la = 0;
 	    try {
-	        this.state = 76;
+	        this.state = 82;
 	        this._errHandler.sync(this);
-	        var la_ = this._interp.adaptivePredict(this._input,8,this._ctx);
+	        var la_ = this._interp.adaptivePredict(this._input,9,this._ctx);
 	        switch(la_) {
 	        case 1:
 	            this.enterOuterAlt(localctx, 1);
-	            this.state = 62;
+	            this.state = 67;
 	            this._errHandler.sync(this);
-	            var la_ = this._interp.adaptivePredict(this._input,4,this._ctx);
+	            var la_ = this._interp.adaptivePredict(this._input,5,this._ctx);
 	            if(la_===1) {
-	                this.state = 61;
+	                this.state = 66;
 	                this.lbl();
 
 	            }
-	            this.state = 66;
+	            this.state = 72;
 	            this._errHandler.sync(this);
-	            switch(this._input.LA(1)) {
-	            case 12:
-	                this.state = 64;
+	            var la_ = this._interp.adaptivePredict(this._input,6,this._ctx);
+	            switch(la_) {
+	            case 1:
+	                this.state = 69;
 	                this.instruction();
 	                break;
-	            case 7:
-	            case 9:
-	            case 10:
-	            case 11:
-	            case 13:
-	            case 14:
-	            case 16:
-	                this.state = 65;
+
+	            case 2:
+	                this.state = 70;
 	                this.directive();
 	                break;
-	            default:
-	                throw new antlr4.error.NoViableAltException(this);
+
+	            case 3:
+	                this.state = 71;
+	                this.macrocall();
+	                break;
+
 	            }
-	            this.state = 69;
+	            this.state = 75;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	            if(_la===15) {
-	                this.state = 68;
+	                this.state = 74;
 	                this.comment();
 	            }
 
@@ -198,13 +212,13 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	        case 2:
 	            this.enterOuterAlt(localctx, 2);
-	            this.state = 71;
+	            this.state = 77;
 	            this.lbl();
-	            this.state = 73;
+	            this.state = 79;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	            if(_la===15) {
-	                this.state = 72;
+	                this.state = 78;
 	                this.comment();
 	            }
 
@@ -212,7 +226,7 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	        case 3:
 	            this.enterOuterAlt(localctx, 3);
-	            this.state = 75;
+	            this.state = 81;
 	            this.comment();
 	            break;
 
@@ -239,13 +253,13 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 78;
+	        this.state = 84;
 	        this.opcode();
-	        this.state = 80;
+	        this.state = 86;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
-	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 91776) !== 0)) {
-	            this.state = 79;
+	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 229000) !== 0)) {
+	            this.state = 85;
 	            this.expressionlist();
 	        }
 
@@ -270,7 +284,7 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    this.enterRule(localctx, 6, asmZ80Parser.RULE_opcode);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 82;
+	        this.state = 88;
 	        this.match(asmZ80Parser.OPCODE);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -293,7 +307,7 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    this.enterRule(localctx, 8, asmZ80Parser.RULE_register_);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 84;
+	        this.state = 90;
 	        this.match(asmZ80Parser.REGISTER);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -317,18 +331,24 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 87;
+	        this.state = 93;
 	        this._errHandler.sync(this);
-	        _la = this._input.LA(1);
-	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 91776) !== 0)) {
-	            this.state = 86;
+	        var la_ = this._interp.adaptivePredict(this._input,11,this._ctx);
+	        if(la_===1) {
+	            this.state = 92;
 	            this.argument();
-	        }
 
-	        this.state = 89;
+	        }
+	        this.state = 95;
 	        this.assemblerdirective();
-	        this.state = 90;
-	        this.expressionlist();
+	        this.state = 97;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 229000) !== 0)) {
+	            this.state = 96;
+	            this.expressionlist();
+	        }
+
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -350,7 +370,7 @@ export default class asmZ80Parser extends antlr4.Parser {
 	    this.enterRule(localctx, 12, asmZ80Parser.RULE_assemblerdirective);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 92;
+	        this.state = 99;
 	        this.match(asmZ80Parser.ASSEMBLER_DIRECTIVE);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -368,19 +388,51 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 
 
+	macrocall() {
+	    let localctx = new MacrocallContext(this, this._ctx, this.state);
+	    this.enterRule(localctx, 14, asmZ80Parser.RULE_macrocall);
+	    var _la = 0;
+	    try {
+	        this.enterOuterAlt(localctx, 1);
+	        this.state = 101;
+	        this.match(asmZ80Parser.NAME);
+	        this.state = 103;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if((((_la) & ~0x1f) === 0 && ((1 << _la) & 229000) !== 0)) {
+	            this.state = 102;
+	            this.expressionlist();
+	        }
+
+	    } catch (re) {
+	    	if(re instanceof antlr4.error.RecognitionException) {
+		        localctx.exception = re;
+		        this._errHandler.reportError(this, re);
+		        this._errHandler.recover(this, re);
+		    } else {
+		    	throw re;
+		    }
+	    } finally {
+	        this.exitRule();
+	    }
+	    return localctx;
+	}
+
+
+
 	lbl() {
 	    let localctx = new LblContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 14, asmZ80Parser.RULE_lbl);
+	    this.enterRule(localctx, 16, asmZ80Parser.RULE_lbl);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 94;
+	        this.state = 105;
 	        this.label();
-	        this.state = 96;
+	        this.state = 107;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
 	        if(_la===1) {
-	            this.state = 95;
+	            this.state = 106;
 	            this.match(asmZ80Parser.T__0);
 	        }
 
@@ -402,21 +454,21 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	expressionlist() {
 	    let localctx = new ExpressionlistContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 16, asmZ80Parser.RULE_expressionlist);
+	    this.enterRule(localctx, 18, asmZ80Parser.RULE_expressionlist);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 98;
+	        this.state = 109;
 	        this.expression();
-	        this.state = 103;
+	        this.state = 114;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
 	        while(_la===2) {
-	            this.state = 99;
+	            this.state = 110;
 	            this.match(asmZ80Parser.T__1);
-	            this.state = 100;
+	            this.state = 111;
 	            this.expression();
-	            this.state = 105;
+	            this.state = 116;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	        }
@@ -438,10 +490,10 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	label() {
 	    let localctx = new LabelContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 18, asmZ80Parser.RULE_label);
+	    this.enterRule(localctx, 20, asmZ80Parser.RULE_label);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 106;
+	        this.state = 117;
 	        this.name();
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -461,17 +513,25 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	expression() {
 	    let localctx = new ExpressionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 20, asmZ80Parser.RULE_expression);
+	    this.enterRule(localctx, 22, asmZ80Parser.RULE_expression);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 108;
+	        this.state = 120;
+	        this._errHandler.sync(this);
+	        _la = this._input.LA(1);
+	        if(_la===3) {
+	            this.state = 119;
+	            this.match(asmZ80Parser.T__2);
+	        }
+
+	        this.state = 122;
 	        this.multiplyingExpression();
-	        this.state = 113;
+	        this.state = 127;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
 	        while(_la===3 || _la===4) {
-	            this.state = 109;
+	            this.state = 123;
 	            _la = this._input.LA(1);
 	            if(!(_la===3 || _la===4)) {
 	            this._errHandler.recoverInline(this);
@@ -480,9 +540,9 @@ export default class asmZ80Parser extends antlr4.Parser {
 	            	this._errHandler.reportMatch(this);
 	                this.consume();
 	            }
-	            this.state = 110;
+	            this.state = 124;
 	            this.multiplyingExpression();
-	            this.state = 115;
+	            this.state = 129;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	        }
@@ -504,17 +564,17 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	multiplyingExpression() {
 	    let localctx = new MultiplyingExpressionContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 22, asmZ80Parser.RULE_multiplyingExpression);
+	    this.enterRule(localctx, 24, asmZ80Parser.RULE_multiplyingExpression);
 	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 116;
+	        this.state = 130;
 	        this.argument();
-	        this.state = 121;
+	        this.state = 135;
 	        this._errHandler.sync(this);
 	        _la = this._input.LA(1);
 	        while(_la===5 || _la===6) {
-	            this.state = 117;
+	            this.state = 131;
 	            _la = this._input.LA(1);
 	            if(!(_la===5 || _la===6)) {
 	            this._errHandler.recoverInline(this);
@@ -523,9 +583,9 @@ export default class asmZ80Parser extends antlr4.Parser {
 	            	this._errHandler.reportMatch(this);
 	                this.consume();
 	            }
-	            this.state = 118;
+	            this.state = 132;
 	            this.argument();
-	            this.state = 123;
+	            this.state = 137;
 	            this._errHandler.sync(this);
 	            _la = this._input.LA(1);
 	        }
@@ -547,43 +607,46 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	argument() {
 	    let localctx = new ArgumentContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 24, asmZ80Parser.RULE_argument);
+	    this.enterRule(localctx, 26, asmZ80Parser.RULE_argument);
 	    try {
-	        this.state = 133;
+	        this.state = 147;
 	        this._errHandler.sync(this);
 	        switch(this._input.LA(1)) {
 	        case 14:
 	            this.enterOuterAlt(localctx, 1);
-	            this.state = 124;
+	            this.state = 138;
 	            this.number();
 	            break;
 	        case 10:
 	            this.enterOuterAlt(localctx, 2);
-	            this.state = 125;
+	            this.state = 139;
 	            this.register_();
 	            break;
 	        case 9:
 	            this.enterOuterAlt(localctx, 3);
-	            this.state = 126;
+	            this.state = 140;
 	            this.dollar();
 	            break;
+	        case 11:
+	        case 12:
 	        case 13:
 	            this.enterOuterAlt(localctx, 4);
-	            this.state = 127;
+	            this.state = 141;
 	            this.name();
 	            break;
 	        case 16:
+	        case 17:
 	            this.enterOuterAlt(localctx, 5);
-	            this.state = 128;
+	            this.state = 142;
 	            this.string_();
 	            break;
 	        case 7:
 	            this.enterOuterAlt(localctx, 6);
-	            this.state = 129;
+	            this.state = 143;
 	            this.match(asmZ80Parser.T__6);
-	            this.state = 130;
+	            this.state = 144;
 	            this.expression();
-	            this.state = 131;
+	            this.state = 145;
 	            this.match(asmZ80Parser.T__7);
 	            break;
 	        default:
@@ -607,10 +670,10 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	dollar() {
 	    let localctx = new DollarContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 26, asmZ80Parser.RULE_dollar);
+	    this.enterRule(localctx, 28, asmZ80Parser.RULE_dollar);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 135;
+	        this.state = 149;
 	        this.match(asmZ80Parser.T__8);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -630,11 +693,19 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	string_() {
 	    let localctx = new String_Context(this, this._ctx, this.state);
-	    this.enterRule(localctx, 28, asmZ80Parser.RULE_string_);
+	    this.enterRule(localctx, 30, asmZ80Parser.RULE_string_);
+	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 137;
-	        this.match(asmZ80Parser.STRING);
+	        this.state = 151;
+	        _la = this._input.LA(1);
+	        if(!(_la===16 || _la===17)) {
+	        this._errHandler.recoverInline(this);
+	        }
+	        else {
+	        	this._errHandler.reportMatch(this);
+	            this.consume();
+	        }
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -653,11 +724,19 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	name() {
 	    let localctx = new NameContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 30, asmZ80Parser.RULE_name);
+	    this.enterRule(localctx, 32, asmZ80Parser.RULE_name);
+	    var _la = 0;
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 139;
-	        this.match(asmZ80Parser.NAME);
+	        this.state = 153;
+	        _la = this._input.LA(1);
+	        if(!((((_la) & ~0x1f) === 0 && ((1 << _la) & 14336) !== 0))) {
+	        this._errHandler.recoverInline(this);
+	        }
+	        else {
+	        	this._errHandler.reportMatch(this);
+	            this.consume();
+	        }
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
 		        localctx.exception = re;
@@ -676,10 +755,10 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	number() {
 	    let localctx = new NumberContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 32, asmZ80Parser.RULE_number);
+	    this.enterRule(localctx, 34, asmZ80Parser.RULE_number);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 141;
+	        this.state = 155;
 	        this.match(asmZ80Parser.NUMBER);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -699,10 +778,10 @@ export default class asmZ80Parser extends antlr4.Parser {
 
 	comment() {
 	    let localctx = new CommentContext(this, this._ctx, this.state);
-	    this.enterRule(localctx, 34, asmZ80Parser.RULE_comment);
+	    this.enterRule(localctx, 36, asmZ80Parser.RULE_comment);
 	    try {
 	        this.enterOuterAlt(localctx, 1);
-	        this.state = 143;
+	        this.state = 157;
 	        this.match(asmZ80Parser.COMMENT);
 	    } catch (re) {
 	    	if(re instanceof antlr4.error.RecognitionException) {
@@ -738,8 +817,10 @@ asmZ80Parser.NAME = 13;
 asmZ80Parser.NUMBER = 14;
 asmZ80Parser.COMMENT = 15;
 asmZ80Parser.STRING = 16;
-asmZ80Parser.EOL = 17;
-asmZ80Parser.WS = 18;
+asmZ80Parser.DOUBLE_STRING = 17;
+asmZ80Parser.METADATA = 18;
+asmZ80Parser.EOL = 19;
+asmZ80Parser.WS = 20;
 
 asmZ80Parser.RULE_prog = 0;
 asmZ80Parser.RULE_line = 1;
@@ -748,17 +829,18 @@ asmZ80Parser.RULE_opcode = 3;
 asmZ80Parser.RULE_register_ = 4;
 asmZ80Parser.RULE_directive = 5;
 asmZ80Parser.RULE_assemblerdirective = 6;
-asmZ80Parser.RULE_lbl = 7;
-asmZ80Parser.RULE_expressionlist = 8;
-asmZ80Parser.RULE_label = 9;
-asmZ80Parser.RULE_expression = 10;
-asmZ80Parser.RULE_multiplyingExpression = 11;
-asmZ80Parser.RULE_argument = 12;
-asmZ80Parser.RULE_dollar = 13;
-asmZ80Parser.RULE_string_ = 14;
-asmZ80Parser.RULE_name = 15;
-asmZ80Parser.RULE_number = 16;
-asmZ80Parser.RULE_comment = 17;
+asmZ80Parser.RULE_macrocall = 7;
+asmZ80Parser.RULE_lbl = 8;
+asmZ80Parser.RULE_expressionlist = 9;
+asmZ80Parser.RULE_label = 10;
+asmZ80Parser.RULE_expression = 11;
+asmZ80Parser.RULE_multiplyingExpression = 12;
+asmZ80Parser.RULE_argument = 13;
+asmZ80Parser.RULE_dollar = 14;
+asmZ80Parser.RULE_string_ = 15;
+asmZ80Parser.RULE_name = 16;
+asmZ80Parser.RULE_number = 17;
+asmZ80Parser.RULE_comment = 18;
 
 class ProgContext extends antlr4.ParserRuleContext {
 
@@ -848,6 +930,10 @@ class LineContext extends antlr4.ParserRuleContext {
 	    return this.getTypedRuleContext(DirectiveContext,0);
 	};
 
+	macrocall() {
+	    return this.getTypedRuleContext(MacrocallContext,0);
+	};
+
 	lbl() {
 	    return this.getTypedRuleContext(LblContext,0);
 	};
@@ -1032,14 +1118,14 @@ class DirectiveContext extends antlr4.ParserRuleContext {
 	    return this.getTypedRuleContext(AssemblerdirectiveContext,0);
 	};
 
-	expressionlist() {
-	    return this.getTypedRuleContext(ExpressionlistContext,0);
-	};
-
 	argument() {
 	    return this.getTypedRuleContext(ArgumentContext,0);
 	};
 
+	expressionlist() {
+	    return this.getTypedRuleContext(ExpressionlistContext,0);
+	};
+
 	enterRule(listener) {
 	    if(listener instanceof asmZ80Listener ) {
 	        listener.enterDirective(this);
@@ -1108,6 +1194,53 @@ class AssemblerdirectiveContext extends antlr4.ParserRuleContext {
 
 
 
+class MacrocallContext extends antlr4.ParserRuleContext {
+
+    constructor(parser, parent, invokingState) {
+        if(parent===undefined) {
+            parent = null;
+        }
+        if(invokingState===undefined || invokingState===null) {
+            invokingState = -1;
+        }
+        super(parent, invokingState);
+        this.parser = parser;
+        this.ruleIndex = asmZ80Parser.RULE_macrocall;
+    }
+
+	NAME() {
+	    return this.getToken(asmZ80Parser.NAME, 0);
+	};
+
+	expressionlist() {
+	    return this.getTypedRuleContext(ExpressionlistContext,0);
+	};
+
+	enterRule(listener) {
+	    if(listener instanceof asmZ80Listener ) {
+	        listener.enterMacrocall(this);
+		}
+	}
+
+	exitRule(listener) {
+	    if(listener instanceof asmZ80Listener ) {
+	        listener.exitMacrocall(this);
+		}
+	}
+
+	accept(visitor) {
+	    if ( visitor instanceof asmZ80Visitor ) {
+	        return visitor.visitMacrocall(this);
+	    } else {
+	        return visitor.visitChildren(this);
+	    }
+	}
+
+
+}
+
+
+
 class LblContext extends antlr4.ParserRuleContext {
 
     constructor(parser, parent, invokingState) {
@@ -1465,6 +1598,10 @@ class String_Context extends antlr4.ParserRuleContext {
 	    return this.getToken(asmZ80Parser.STRING, 0);
 	};
 
+	DOUBLE_STRING() {
+	    return this.getToken(asmZ80Parser.DOUBLE_STRING, 0);
+	};
+
 	enterRule(listener) {
 	    if(listener instanceof asmZ80Listener ) {
 	        listener.enterString_(this);
@@ -1508,6 +1645,14 @@ class NameContext extends antlr4.ParserRuleContext {
 	    return this.getToken(asmZ80Parser.NAME, 0);
 	};
 
+	OPCODE() {
+	    return this.getToken(asmZ80Parser.OPCODE, 0);
+	};
+
+	ASSEMBLER_DIRECTIVE() {
+	    return this.getToken(asmZ80Parser.ASSEMBLER_DIRECTIVE, 0);
+	};
+
 	enterRule(listener) {
 	    if(listener instanceof asmZ80Listener ) {
 	        listener.enterName(this);
@@ -1627,6 +1772,7 @@ asmZ80Parser.OpcodeContext = OpcodeContext;
 asmZ80Parser.Register_Context = Register_Context; 
 asmZ80Parser.DirectiveContext = DirectiveContext; 
 asmZ80Parser.AssemblerdirectiveContext = AssemblerdirectiveContext; 
+asmZ80Parser.MacrocallContext = MacrocallContext; 
 asmZ80Parser.LblContext = LblContext; 
 asmZ80Parser.ExpressionlistContext = ExpressionlistContext; 
 asmZ80Parser.LabelContext = LabelContext;