UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore \ ctrlchar in lexing

Browse Source
This commit is contained in:
Peace-Maker 2014-05-28 03:07:25 +02:00
parent cf617a4d20
commit cd0d31805c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sourcepawn/compiler/sc2.c
View File

@ -2052,8 +2052,8 @@ SC_FUNC int lex(cell *lexvalue,char **lexsym)
} /* if */ } /* if */
} /* if */ } /* if */
} else if (*lptr=='\"' /* unpacked string literal */ } else if (*lptr=='\"' /* unpacked string literal */
|| (*lptr==sc_ctrlchar && *(lptr+1)=='\"') /* unpacked raw string */
#if 0 #if 0
|| (*lptr==sc_ctrlchar && *(lptr+1)=='\"') /* unpacked raw string */
|| (*lptr=='!' && *(lptr+1)=='\"') /* packed string */ || (*lptr=='!' && *(lptr+1)=='\"') /* packed string */
|| (*lptr=='!' && *(lptr+1)==sc_ctrlchar && *(lptr+2)=='\"') /* packed raw string */ || (*lptr=='!' && *(lptr+1)==sc_ctrlchar && *(lptr+2)=='\"') /* packed raw string */
|| (*lptr==sc_ctrlchar && *(lptr+1)=='!' && *(lptr+2)=='\"') /* packed raw string */ || (*lptr==sc_ctrlchar && *(lptr+1)=='!' && *(lptr+2)=='\"') /* packed raw string */
@ -2121,10 +2121,13 @@ SC_FUNC int lex(cell *lexvalue,char **lexsym)
} /* if */ } /* if */
} /* while */ } /* while */
if (!freading || !(*lptr=='\"' if (!freading || !(*lptr=='\"'
#if 0
|| *lptr==sc_ctrlchar && *(lptr+1)=='\"' || *lptr==sc_ctrlchar && *(lptr+1)=='\"'
|| *lptr=='!' && *(lptr+1)=='\"' || *lptr=='!' && *(lptr+1)=='\"'
|| *lptr=='!' && *(lptr+1)==sc_ctrlchar && *(lptr+2)=='\"' || *lptr=='!' && *(lptr+1)==sc_ctrlchar && *(lptr+2)=='\"'
|| *lptr==sc_ctrlchar && *(lptr+1)=='!' && *(lptr+2)=='\"')) || *lptr==sc_ctrlchar && *(lptr+1)=='!' && *(lptr+2)=='\"'
#endif
))
{ {
error(37); /* invalid string concatenation */ error(37); /* invalid string concatenation */
break; break;