820724 - Add support for more elaborate expressions for Preprocessor.py

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

I seem to remember there are some places where we're going through hoops around the lack of &&, || and defined() in Preprocessor.py. I happen to be hitting one more in bug 755724 so enough is enough.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Add support for more elaborate expressions for Preprocessor.py

This allows #if defined(FOO) || defined(BAR) && defined(BAZ)

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 691246 [details] [diff] [review]
Add support for more elaborate expressions for Preprocessor.py

Review of attachment 691246 [details] [diff] [review]:
-----------------------------------------------------------------

I predict that we're going to want parentheses next. Thanks for fixing this.

::: config/Expression.py
@@ +58,5 @@
> +    return rv
> +
> +  def __get_logical_and(self):
> +    """
> +    Production: test ( '||' and_cond ) ?

&&

Comment 3

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/213b4178df8c

Comment 4

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/213b4178df8c