diff options
author | Mike Buland <eichlan@xagasoft.com> | 2015-01-29 08:56:43 -0700 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2015-01-29 08:56:43 -0700 |
commit | 14419813582bc89334d2e9d5bdd74b5852bfc9f9 (patch) | |
tree | 9b6dff56e27d485652dfd019391aef4845ff01c1 /src/unitparser.cpp | |
parent | 42e77eb7ba24d2b7ebd47fadbc9240dc4520a5d6 (diff) | |
parent | f03026f5c2cde1eecfda273eaa52df10287f0f9e (diff) | |
download | clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.gz clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.bz2 clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.tar.xz clic-14419813582bc89334d2e9d5bdd74b5852bfc9f9.zip |
Merge branch 'master' of /home/eichlan/git/clic
Diffstat (limited to '')
-rw-r--r-- | src/unitparser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/unitparser.cpp b/src/unitparser.cpp index e23f76c..f518fdc 100644 --- a/src/unitparser.cpp +++ b/src/unitparser.cpp | |||
@@ -38,6 +38,8 @@ void UnitParser::order1() | |||
38 | unitTest(parse("1.59*40/24*21", 5) == "55.65"); | 38 | unitTest(parse("1.59*40/24*21", 5) == "55.65"); |
39 | unitTest(parse("1.59*40/(24*21)", 5) == "0.12619"); // bc says it's this: "0.12619"); | 39 | unitTest(parse("1.59*40/(24*21)", 5) == "0.12619"); // bc says it's this: "0.12619"); |
40 | unitTest(parse("10+2*2*2+2") == "20"); | 40 | unitTest(parse("10+2*2*2+2") == "20"); |
41 | unitTest(parse("5-5-1") == "-1"); | ||
42 | unitTest(parse("5-(1+2+2)-1") == "-1"); | ||
41 | } | 43 | } |
42 | 44 | ||
43 | void UnitParser::assignment() | 45 | void UnitParser::assignment() |