cpp11 branch merged back to to trunk

git-svn-id: svn://ultimatepp.org/upp/trunk@7047 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-03-16 16:33:48 +00:00
parent 3f6132b553
commit 51687976c2
155 changed files with 1887 additions and 1038 deletions

View file

@ -168,6 +168,11 @@ void Lex::Next()
while(iscid(*ptr))
x.Cat(*ptr++);
int q = id.FindAdd(x);
if(q == tk_rval_ - 256) { // simple hack for transitionary macro
AddCode('&');
AddCode('&');
}
else
if(q >= ignore_low && q < ignore_high)
while(*ptr && (byte)*ptr <= ' ') {
ptr++;