diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-17 16:44:09 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-17 16:44:09 +0200 |
commit | ec4afb2e21db1f04794c720c5835a00d154f0c56 (patch) | |
tree | 7a0a0580aa3d2919191712deb16cfeb1b41db802 | |
parent | 8c6c0d9b82f46e808eeff658e73ee241ea58f2a0 (diff) | |
download | meson-ec4afb2e21db1f04794c720c5835a00d154f0c56.zip meson-ec4afb2e21db1f04794c720c5835a00d154f0c56.tar.gz meson-ec4afb2e21db1f04794c720c5835a00d154f0c56.tar.bz2 |
Removed parentheses from if expression.
-rwxr-xr-x | bparser.py | 4 | ||||
-rw-r--r-- | test cases/17 if/builder.txt | 4 | ||||
-rw-r--r-- | test cases/18 else/builder.txt | 2 | ||||
-rw-r--r-- | test cases/19 comparison/builder.txt | 8 | ||||
-rw-r--r-- | test cases/25 numbers/builder.txt | 2 | ||||
-rw-r--r-- | test cases/26 endian/builder.txt | 2 |
6 files changed, 11 insertions, 11 deletions
@@ -149,8 +149,8 @@ def p_statement_method_call(t): t[0] = nodes.MethodCall(t[1], t[3], t[5], t.lineno(1)) def p_statement_if(t): - 'statement : IF LPAREN statement RPAREN EOL codeblock elseblock ENDIF' - t[0] = nodes.IfStatement(t[3], t[6], t[7], t.lineno(1)) + 'statement : IF statement EOL codeblock elseblock ENDIF' + t[0] = nodes.IfStatement(t[2], t[4], t[5], t.lineno(1)) def p_empty_else(t): 'elseblock : ' diff --git a/test cases/17 if/builder.txt b/test cases/17 if/builder.txt index 96615b9..f163d74 100644 --- a/test cases/17 if/builder.txt +++ b/test cases/17 if/builder.txt @@ -3,11 +3,11 @@ project('if test', 'c') var1 = true var2 = false -if(var1) +if var1 exe = executable('prog', 'prog.c') endif -if(var2) +if var2 exe = executable('breakbreakbreak', 'crashing.c') endif diff --git a/test cases/18 else/builder.txt b/test cases/18 else/builder.txt index f3588d7..1555384 100644 --- a/test cases/18 else/builder.txt +++ b/test cases/18 else/builder.txt @@ -2,7 +2,7 @@ project('else test', 'c') var = false -if(var) +if var exe = executable('break', 'break.c') else exe = executable('prog', 'prog.c') diff --git a/test cases/19 comparison/builder.txt b/test cases/19 comparison/builder.txt index 4c84fda..27f9122 100644 --- a/test cases/19 comparison/builder.txt +++ b/test cases/19 comparison/builder.txt @@ -3,25 +3,25 @@ project('comparison', 'c') var1 = 'foo' var2 = 'bar' -if(var1 == var2) +if var1 == var2 exe1 = executable('broken', 'broken.c') else exe1 = executable('prog1', 'prog.c') endif -if(var1 == var1) +if var1 == var1 exe2 = executable('prog2', 'prog.c') else exe2 = executable('broken', 'broken.c') endif -if(var1 != var2) +if var1 != var2 exe3 = executable('prog3', 'prog.c') else exe3 = executable('broken', 'broken.c') endif -if(var1 != var1) +if var1 != var1 exe4 = executable('broken', 'broken.c') else exe4 = executable('prog4', 'prog.c') diff --git a/test cases/25 numbers/builder.txt b/test cases/25 numbers/builder.txt index b7e7904..ea965b0 100644 --- a/test cases/25 numbers/builder.txt +++ b/test cases/25 numbers/builder.txt @@ -1,6 +1,6 @@ project('numbers', 'c') -if(host.pointer_size() == 64) +if host.pointer_size() == 64 add_global_arguments('-DIS64', language : 'c') endif diff --git a/test cases/26 endian/builder.txt b/test cases/26 endian/builder.txt index e3c7b6f..54bdda2 100644 --- a/test cases/26 endian/builder.txt +++ b/test cases/26 endian/builder.txt @@ -1,6 +1,6 @@ project('endian check', 'c') -if(host.is_big_endian()) +if host.is_big_endian() add_global_arguments('c', '-DIS_BE') endif |