Revert _Pragma operator

Revert "Add support for C11-style _Pragma operator on processpre".
Revert "Add unit test for the _Pragma operator".

This reverts commits 31fcb331c7 and e261ac2121.

This should rather be the job of the preprocessor, which should generate #pragma lines. gcc does that.
This commit is contained in:
Sei Lisa 2019-01-17 20:26:46 +01:00
parent fba40123e1
commit 36ed90c9ba
4 changed files with 5 additions and 58 deletions

View file

@ -465,7 +465,7 @@ class parser(object):
else:
self.SetOpt(opt, True)
def GetToken(self, pragma=False):
def GetToken(self):
"""Lexer"""
try:
@ -580,23 +580,6 @@ class parser(object):
ident += self.script[self.pos]
self.pos += 1
if self.processpre and ident == '_Pragma' and not pragma:
savepos = self.pos
errorpos = self.errorpos
tok = self.tok
if (self.GetToken(True)[0] == '('
and self.NextToken(True)[0] == 'STRING_VALUE'
and self.GetToken(True)[0] == ')'
):
self.ProcessDirective("#pragma "
+ self.tok[1])
return self.GetToken()
else:
self.pos = savepos
self.errorpos = errorpos
self.tok = tok
# Got an identifier - check if it's a reserved word
if ident in self.keywords:
return (ident.upper(),)
@ -723,10 +706,9 @@ class parser(object):
return ('EOF',)
def NextToken(self, pragma=False):
def NextToken(self):
"""Calls GetToken and sets the internal token."""
self.tok = self.GetToken(pragma)
return self.tok
self.tok = self.GetToken()
# Recursive-descendent parser. The result is an AST and a symbol table.
@ -2956,8 +2938,7 @@ list lazy_list_set(list L, integer i, list v)
self.scanglobals = True # Tell the lexer not to process directives
self.pos = self.errorpos = 0
self.linestart = True
self.tok = None
self.NextToken()
self.tok = self.GetToken()
self.globals = self.BuildTempGlobalsTable() if not lslcommon.IsCalc \
else self.funclibrary.copy()
@ -2967,8 +2948,7 @@ list lazy_list_set(list L, integer i, list v)
self.scanglobals = False
self.pos = self.errorpos = 0
self.linestart = True
self.tok = None
self.NextToken()
self.tok = self.GetToken()
# Reserve spots at the beginning for functions we add
self.tree = [nr(nt='LAMBDA', t=None)]