generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am eec57b37: Merge "Add support for the ternary operator to the header scrubber."

Browse Source 
* commit 'eec57b370642f1b83285883104f2e778f32eef73':
  Add support for the ternary operator to the header scrubber.
This commit is contained in:
Elliott Hughes
2013-11-21 11:34:47 -08:00
committed by Android Git Automerger
parent cb478f23cc eec57b3706
commit 843367953f
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libc/kernel/tools/cpp.py
View File

@@ -554,19 +554,21 @@ class CppExpr:
where "op" is a string describing the operation"""
unaries = [ "!", "~" ]
binaries = [ "+", "-", "<", "<=", ">=", ">", "&&", "||", "*", "/", "%", "&", "|", "^", "<<", ">>", "==", "!=" ]
precedences = { "||": 1,
"&&": 2,
"|": 3,
"^": 4,
"&": 5,
"==":6, "!=":6,
"<":7, "<=":7, ">":7, ">=":7,
"<<":8, ">>":8,
"+":9, "-":9,
"*":10, "/":10, "%":10,
"!":11, "~":12
}
binaries = [ "+", "-", "<", "<=", ">=", ">", "&&", "||", "*", "/", "%", "&", "|", "^", "<<", ">>", "==", "!=", "?", ":" ]
precedences = {
"?": 1, ":": 1,
"||": 2,
"&&": 3,
"|": 4,
"^": 5,
"&": 6,
"==": 7, "!=": 7,
"<": 8, "<=": 8, ">": 8, ">=": 8,
"<<": 9, ">>": 9,
"+": 10, "-": 10,
"*": 11, "/": 11, "%": 11,
"!": 12, "~": 12
}
re_cpp_constant = re.compile(r"((\d|\w|_)+)")
@@ -581,7 +583,7 @@ class CppExpr:
if debugCppExpr:
print "CppExpr: got " + repr(self.expr)
if self.i != self.n:
print 'crap at end of input (%d != %d)' % (self.i, self.n)
print 'crap at end of input (%d != %d): %s' % (self.i, self.n, repr(tokens))
raise
@@ -778,6 +780,10 @@ class CppExpr:
self.nextToken()
primary = self.parseExpression(0)
self.expectId(tokRPAREN)
elif op.id == "?":
self.nextToken()
primary = self.parseExpression(0)
self.expectId(":")
elif op.id == tokNUMBER:
primary = self.is_number()
elif op.id == tokIDENT: