ST6RI-521 Changed .$ to .? in TargetExpression in SysML grammar.

Author: seidewitz

org.omg.sysml.jupyter.jupyterlab/src/main/mode.ts

@@ -77,22 +77,7 @@ export function defineSysMLv2Mode(): void {
                     if(stream.match('/*', false)) stream.next();
                     return false;
                 },
-                 "#": function(stream: CodeMirror.StringStream) {
-                 	do {
-                 		if (stream.match("'", true)) { 
-                    		let b_escaped = false;
-                    		let s_next;
-                    		while(s_next = stream.next()) {
-                        		if(s_next === "'" && !b_escaped) break;
-                        		b_escaped = !b_escaped && s_next === '\\';
-                    		}
-                		} else {
-                			stream.eatWhile(/\w/);
-                		}
-                	} while (stream.match('::', true))
-                    return 'keyword';
-                },
-           },
+            },
         });
     });
 

org.omg.sysml.jupyter.kernel/src/main/resources/kernel/kernel.js

@@ -75,35 +75,21 @@ var enableMode = function (CodeMirror) {
             modeProps: {fold: ["brace"]},
             hooks: {
                 "'": function (stream) {
-                    let b_escaped = false;
-                    let s_next;
-                    while(s_next = stream.next()) {
-                        if(s_next === "'" && !b_escaped) break;
-                        b_escaped = !b_escaped && s_next === '\\';
+                    var escaped = false, next;
+                    while ((next = stream.next()) != null) {
+                        if (next == "'" && !escaped) {
+                            break;
+                        }
+                        escaped = !escaped && next == "\\";
                     }
-                    return 'variable';
+                    return "variable";
                 },
                 "/": function (stream) {
                     if (stream.match("/*", false)) {
                         stream.next();
                     }
                     return false;
                 }
-                "#": function(stream) {
-                 	do {
-                 		if (stream.match("'", true)) { 
-                    		let b_escaped = false;
-                    		let s_next;
-                    		while(s_next = stream.next()) {
-                        		if(s_next === "'" && !b_escaped) break;
-                        		b_escaped = !b_escaped && s_next === '\\';
-                    		}
-                		} else {
-                			stream.eatWhile(/\w/);
-                		}
-                	} while (stream.match('::', true))
-                    return 'keyword';
-                },
             }
         });
     });

org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/SysML.xtextbin

@@ -16085,9 +16085,9 @@ ruleTargetExpression returns [EObject current=null]
 								$current);
 						}
 					)
-					otherlv_18='.$'
+					otherlv_18='.?'
 					{
-						newLeafNode(otherlv_18, grammarAccess.getTargetExpressionAccess().getFullStopDollarSignKeyword_1_1_3_1());
+						newLeafNode(otherlv_18, grammarAccess.getTargetExpressionAccess().getFullStopQuestionMarkKeyword_1_1_3_1());
 					}
 					(
 						(

org.omg.sysml.xtext/src-gen/org/omg/sysml/xtext/parser/antlr/internal/InternalSysML.g

@@ -12,10 +12,9 @@
 ','=18
 '-'=159
 '->'=98
-'.$'=99
 '.'=85
 '..'=52
-'.?'=164
+'.?'=99
 '/'=160
 ':'=47
 '::'=40
@@ -52,7 +51,7 @@
 'as'=155
 'assert'=120
 'assign'=97
-'assume'=175
+'assume'=174
 'at'=93
 'attribute'=64
 'bind'=75
@@ -81,13 +80,13 @@
 'exhibit'=115
 'exit'=114
 'expose'=136
-'false'=167
+'false'=166
 'filter'=34
 'first'=77
 'flow'=84
 'for'=36
 'fork'=109
-'frame'=177
+'frame'=176
 'from'=54
 'hastype'=153
 'if'=100
@@ -96,7 +95,7 @@
 'in'=105
 'include'=133
 'individual'=67
-'inout'=172
+'inout'=171
 'interface'=86
 'istype'=154
 'item'=70
@@ -108,50 +107,50 @@
 'metadata'=22
 'nonunique'=46
 'not'=121
-'null'=165
+'null'=164
 'objective'=129
 'occurrence'=66
 'of'=83
 'or'=145
 'ordered'=45
-'out'=171
+'out'=170
 'package'=33
 'parallel'=111
 'part'=71
 'perform'=90
 'port'=72
-'private'=169
-'protected'=170
-'public'=168
+'private'=168
+'protected'=169
+'public'=167
 'readonly'=58
 'redefines'=32
 'ref'=30
 'render'=135
 'rendering'=138
 'rep'=20
-'require'=176
+'require'=175
 'requirement'=122
 'return'=118
 'satisfy'=126
 'send'=96
-'snapshot'=173
+'snapshot'=172
 'specializes'=44
 'stakeholder'=125
 'state'=110
 'subject'=123
 'subsets'=50
 'succession'=76
 'then'=69
-'timeslice'=174
+'timeslice'=173
 'to'=55
 'transition'=116
-'true'=166
+'true'=165
 'until'=104
 'use'=132
 'variant'=57
 'variation'=56
 'verification'=131
-'verify'=178
+'verify'=177
 'via'=92
 'view'=134
 'viewpoint'=137
@@ -254,7 +253,6 @@ T__174=174
 T__175=175
 T__176=176
 T__177=177
-T__178=178
 T__17=17
 T__18=18
 T__19=19