Skip to content

Commit b06ffe4

Browse files
authored
Merge branch 'master' into development
2 parents b7c6f68 + 935c3fc commit b06ffe4

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.appveyor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,13 @@ artifacts:
204204
# global handlers #
205205
#---------------------------------#
206206

207+
208+
# If you need to investigate worker on build finish uncomment this
209+
# to display Remote Desktop connection details and pause the build
210+
# until a special “lock” file on VM desktop is deleted
211+
#on_finish:
212+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
213+
207214
on_success:
208215
- 'dir'
209216

parser/scanner.re

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,11 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
485485
return 0;
486486
}
487487
488-
// interned strings, allowing to instantiate strings
488+
/* interned strings, allowing to instantiate strings */
489489
ISTRING = ([~]["] ([\\]["]|[\\].|[\001-\377]\[\\"])* ["]);
490490
ISTRING {
491-
start++; // ~
492-
start++; // "
491+
start++; /* ~ */
492+
start++; /* " */
493493
token->opcode = XX_T_ISTRING;
494494
token->value = estrndup(start, YYCURSOR - start - 1);
495495
token->len = YYCURSOR - start - 1;

0 commit comments

Comments
 (0)