Improve handling of Crystal's quoted labels (compiler-explorer#2789)

tomrittervg · Jul 20, 2021 · 9829915 · 9829915
1 parent abee7b3
commit 9829915
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/asm-parser-crystal.js b/lib/asm-parser-crystal.js
@@ -30,11 +30,11 @@ export class CrystalAsmParser extends AsmParser {
 
         // Crystal labels are not mangled, instead they are enclosed in quotes
         // whenever necessary
-        this.labelDef = /^([\w$.@]+|"[^"]+"):$/;
-        this.indentedLabelDef = /^\s*([\w$.@]+|"[^"]+"):/;
-        this.labelFindNonMips = /[\w.][\w$.@]*|"[^"]+"/g;
-        this.labelFindMips = /[\w$.@]+|"[^"]+"/g;
-        this.definesGlobal = /^\s*\.(?:globa?l|GLB|export)\s*([.A-Z_a-z][\w$.]*|"[^"]+")/;
-        this.definesWeak = /^\s*\.(?:weakext|weak)\s*([.A-Z_a-z][\w$.]*|"[^"]+")/;
+        this.labelDef = /^([\w$.@]+|"(?:[^"\\]|\\.)+"):$/;
+        this.indentedLabelDef = /^\s*([\w$.@]+|"(?:[^"\\]|\\.)+"):/;
+        this.labelFindNonMips = /[\w.][\w$.@]*|"(?:[^"\\]|\\.)+"/g;
+        this.labelFindMips = /[\w$.@]+|"(?:[^"\\]|\\.)+"/g;
+        this.definesGlobal = /^\s*\.(?:globa?l|GLB|export)\s*([.A-Z_a-z][\w$.]*|"(?:[^"\\]|\\.)+")/;
+        this.definesWeak = /^\s*\.(?:weakext|weak)\s*([.A-Z_a-z][\w$.]*|"(?:[^"\\]|\\.)+")/;
     }
 }
diff --git a/static/modes/asm-mode.js b/static/modes/asm-mode.js
@@ -43,6 +43,8 @@ function definition() {
                 [/^<.*>$/, {token: 'annotation'}],
                 // Label definition
                 [/^[.a-zA-Z0-9_$?@].*:/, {token: 'type.identifier'}],
+                // Label definition (quoted)
+                [/^"([^"\\]|\\.)*":/, {token: 'type.identifier'}],
                 // Label definition (ARM style)
                 [/^\s*[|][^|]*[|]/, {token: 'type.identifier'}],
                 // Label definition (CL style)