Merge branch 'master' into development

Author: sergeyklay

.appveyor.yml

@@ -204,6 +204,13 @@ artifacts:
 #        global handlers          #
 #---------------------------------#
 
+
+# If you need to investigate worker on build finish uncomment this
+# to display Remote Desktop connection details and pause the build
+# until a special “lock” file on VM desktop is deleted
+#on_finish:
+#    - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 on_success:
     - 'dir'
 

parser/scanner.re

@@ -485,11 +485,11 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 			return 0;
 		}
 
-		// interned strings, allowing to instantiate strings
+		/* interned strings, allowing to instantiate strings */
 		ISTRING = ([~]["] ([\\]["]|[\\].|[\001-\377]\[\\"])* ["]);
 		ISTRING {
-			start++; // ~
-			start++; // "
+			start++; /* ~ */
+			start++; /* " */
 			token->opcode = XX_T_ISTRING;
 			token->value = estrndup(start, YYCURSOR - start - 1);
 			token->len = YYCURSOR - start - 1;