| 1 |
commit: b398a6957cf171ba7f599e07d90379a29e727b3a |
| 2 |
Author: Petteri Räty <petsku <AT> petteriraty <DOT> eu> |
| 3 |
AuthorDate: Fri Apr 8 14:34:18 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 8 14:34:18 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b398a695 |
| 7 |
|
| 8 |
Rename tdm to times_division_modulus |
| 9 |
|
| 10 |
--- |
| 11 |
bashast/bashast.g | 5 +++-- |
| 12 |
bashast/gunit/arith_main.gunit | 2 +- |
| 13 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/bashast/bashast.g b/bashast/bashast.g |
| 16 |
index fde875d..c20cef4 100644 |
| 17 |
--- a/bashast/bashast.g |
| 18 |
+++ b/bashast/bashast.g |
| 19 |
@@ -466,8 +466,9 @@ negation |
| 20 |
: (BANG^BLANK!?|TILDE^BLANK!?)?unary; |
| 21 |
exponential |
| 22 |
: negation (BLANK!* EXP^ BLANK!* negation)* ; |
| 23 |
-tdm : exponential (BLANK!*(TIMES^|SLASH^|PCT^)BLANK!* exponential)*; |
| 24 |
-addsub : tdm (BLANK!* (PLUS^|MINUS^)BLANK!* tdm)*; |
| 25 |
+times_division_modulus |
| 26 |
+ : exponential (BLANK!*(TIMES^|SLASH^|PCT^)BLANK!* exponential)*; |
| 27 |
+addsub : times_division_modulus (BLANK!* (PLUS^|MINUS^)BLANK!* times_division_modulus)*; |
| 28 |
shifts : addsub (BLANK!* (LSHIFT^|RSHIFT^) BLANK!* addsub)*; |
| 29 |
compare : shifts (BLANK!* (LEQ^|GEQ^|LESS_THAN^|GREATER_THAN^)BLANK!* shifts)?; |
| 30 |
bitwiseand |
| 31 |
|
| 32 |
diff --git a/bashast/gunit/arith_main.gunit b/bashast/gunit/arith_main.gunit |
| 33 |
index 1444203..be91c42 100644 |
| 34 |
--- a/bashast/gunit/arith_main.gunit |
| 35 |
+++ b/bashast/gunit/arith_main.gunit |
| 36 |
@@ -49,7 +49,7 @@ exponential: |
| 37 |
"6**2" -> (** 6 2) |
| 38 |
"-5**+4" -> (** (MINUS_SIGN 5) (PLUS_SIGN 4)) |
| 39 |
|
| 40 |
-tdm: |
| 41 |
+times_division_modulus: |
| 42 |
"9" -> "9" |
| 43 |
"7 * 9" -> (* 7 9) |
| 44 |
"7 / 9" -> (/ 7 9) |
Archives