Fundamental Redesign of Evaluation

MathPad/MPToken.h

@@ -23,24 +23,11 @@
     @constant   MPOperatorListToken
                 A list of operators (+ and - symbols). The token may be longer
                 than the number of operators if there are spaces between them.
- 
-    @constant   MPSinToken
-                The sin function.
- 
-    @constant   MPCosToken
-                The cos function.
- 
-    @constant   MPTanToken
-                The tan function.
- 
-    @constant   MPASinToken
-                The asin function.
- 
-    @constant   MPACosToken
-                The acos function.
- 
-    @constant   MPATanToken
-                The atan function.
+
+    @constant   MPElementaryFunction
+                @em Most elementary functions are represented by this token type.
+                Elementary functions not categorized as such are those that can
+                not be represented as text (e.g. roots and powers).
  
     @constant   MPNumberToken
                 A number. This may be an integer or a floating point number.
@@ -66,18 +53,15 @@
                 Any symbol that does not match any other token.
  */
 typedef NS_ENUM(NSUInteger, MPTokenType) {
+    MPEOFToken = 0,
     MPMultiplicationSymbolToken,
     MPOperatorListToken,
-    MPSinToken,
-    MPCosToken,
-    MPTanToken,
-    MPASinToken,
-    MPACosToken,
-    MPATanToken,
+    MPElementaryFunctionToken,
     MPNumberToken,
     MPVariableToken,
-    MPFactorialToken,
     MPEqualsToken,
+    MPFactorialToken,
+    MPPowerToken,
     MPGenericFunctionToken,
     
     MPWhitespaceToken,