diff options
Diffstat (limited to '')
-rw-r--r-- | src/formula.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/formula.h b/src/formula.h index d93e27b..757884f 100644 --- a/src/formula.h +++ b/src/formula.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "bu/stack.h" | 17 | #include "bu/stack.h" |
18 | #include "bu/exceptionbase.h" | 18 | #include "bu/exceptionbase.h" |
19 | #include "bu/hash.h" | 19 | #include "bu/hash.h" |
20 | #include "bu/fstring.h" | 20 | #include "bu/string.h" |
21 | 21 | ||
22 | namespace Bu | 22 | namespace Bu |
23 | { | 23 | { |
@@ -41,8 +41,8 @@ namespace Bu | |||
41 | virtual prec operator()( prec )=0; | 41 | virtual prec operator()( prec )=0; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | typedef Hash<Bu::FString, prec> varHash; | 44 | typedef Hash<Bu::String, prec> varHash; |
45 | typedef Hash<Bu::FString, Func *> funcHash; | 45 | typedef Hash<Bu::String, Func *> funcHash; |
46 | 46 | ||
47 | Formula() | 47 | Formula() |
48 | { | 48 | { |
@@ -57,7 +57,7 @@ namespace Bu | |||
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | prec run( const Bu::FString &sFormulaSrc ) | 60 | prec run( const Bu::String &sFormulaSrc ) |
61 | { | 61 | { |
62 | if( sFormulaSrc.isEmpty() ) | 62 | if( sFormulaSrc.isEmpty() ) |
63 | throw FormulaException("Empty formula, nothing to do."); | 63 | throw FormulaException("Empty formula, nothing to do."); |
@@ -158,7 +158,7 @@ namespace Bu | |||
158 | 158 | ||
159 | Bu::Stack<symType> sOper; | 159 | Bu::Stack<symType> sOper; |
160 | Bu::Stack<prec> sValue; | 160 | Bu::Stack<prec> sValue; |
161 | Bu::Stack<Bu::FString> sFunc; | 161 | Bu::Stack<Bu::String> sFunc; |
162 | 162 | ||
163 | private: | 163 | private: |
164 | symType getPrec( symType nOper ) | 164 | symType getPrec( symType nOper ) |