Add support for back-tick strings. Update to JDK 11.

ajkhoury · Oct 31, 2019 · 12441e9 · 12441e9
1 parent c9fc519
commit 12441e9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,13 +1,13 @@
 <idea-plugin>
     <id>com.nasmlanguage</id>
     <name>NASM Assembly Language</name>
-    <version>0.4-beta.6</version>
+    <version>0.4-beta.7</version>
     <vendor email="[email protected]" url="https://github.com/ajkhoury">Aidan Khoury</vendor>
 
     <description><![CDATA[
         <h1>NASM assembly language for JetBrains IDEs</h1>
         <br>
-        <h2>Version v0.4-beta.6 pre-release</h2>
+        <h2>Version v0.4-beta.7 pre-release</h2>
         <br>
         <h3>Features</h3>
         <ul>
@@ -74,6 +74,7 @@
             <li>Macro parameters can now be any expression or mnemonic.</li>
             <li>Added size type prefix for registers.</li>
             <li>Added support for commas in directives.</li>
+            <li>Added support for back-tick strings.</li>
         </ul>
     ]]>
     </change-notes>
@@ -94,7 +95,7 @@
         <lang.syntaxHighlighterFactory key="NASM" language="NASM" implementationClass="com.nasmlanguage.NASMSyntaxHighlighterFactory"/>
         <colorSettingsPage implementation="com.nasmlanguage.NASMColorSettingsPage"/>
         <lang.braceMatcher language="NASM" implementationClass="com.nasmlanguage.NASMPairedBraceMatcher"/>
-        <completion.contributor language="NASM" implementationClass="com.nasmlanguage.NASMCompletionContributor"/>
+        <!--completion.contributor language="NASM" implementationClass="com.nasmlanguage.NASMCompletionContributor"/-->
         <psi.referenceContributor implementation="com.nasmlanguage.NASMReferenceContributor"/>
         <!--lang.findUsagesProvider language="NASM" implementationClass="com.nasmlanguage.NASMFindUsagesProvider"/-->
         <gotoSymbolContributor implementation="com.nasmlanguage.NASMChooseByNameContributor"/>

diff --git a/src/com/nasmlanguage/NASM.bnf b/src/com/nasmlanguage/NASM.bnf
@@ -236,8 +236,8 @@ SOFTWARE.
         ZEROES              = 'regexp:[0]+'
         DECIMAL             = 'regexp:((([1-9][0-9]*\.?[0-9]*)|(\.[0-9]+))([Ee][+-]?[0-9]+)?|0[dD][0-9]+|[0-9]+)'
         //SEGMENT_ADDR        = 'regexp:(((0[xX][0-9a-fA-F]+|0[hH][0-9a-fA-F]+|\$[0-9]+[0-9a-fA-F]*|[0-9]+[0-9a-fA-F]*[hH])|[0]+):((0[xX][0-9a-fA-F]+|0[hH][0-9a-fA-F]+|\$[0-9]+[0-9a-fA-F]*|[0-9]+[0-9a-fA-F]*[hH])|[a-zA-Z_][a-zA-Z0-9_]*|[0]+))'
-        CHARACTER           = "regexp:('([^'\\]|\\.)')"
-        STRING              = "regexp:('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")"
+        CHARACTER           = "regexp:(`([^`\\]|\\.)`|'([^'\\]|\\.)')"
+        STRING              = "regexp:(`([^`\\]|\\.)*`|'([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")"
 
         COLON               = ':'
         SEMICOLON           = ';'

diff --git a/src/com/nasmlanguage/_NASMLexer.flex b/src/com/nasmlanguage/_NASMLexer.flex
@@ -197,8 +197,8 @@ BINARY=(0[bB][0-1]+|0[yY][0-1]+|[0-1][0-1]*[bB]|[0-1][0-1]*[yY])
 HEXADECIMAL=(0[xX][0-9a-fA-F]+|0[hH][0-9a-fA-F]+|\$[0-9]+[0-9a-fA-F]*|[0-9]+[0-9a-fA-F]*[hH])
 ZEROES=[0]+
 DECIMAL=((([1-9][0-9]*\.?[0-9]*)|(\.[0-9]+))([Ee][+-]?[0-9]+)?|0[dD][0-9]+|[0-9]+)
-CHARACTER=('([^'\\]|\\.)')
-STRING=('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")
+CHARACTER=(`([^`\\]|\\.)`|'([^'\\]|\\.)')
+STRING=(`([^`\\]|\\.)*`|'([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")
 
 %%
 <YYINITIAL> {