[merge] merging in the Ohio expansion numex changes from master

2017-11-29 11:51:25 -05:00
parent fbf88aee88 7d001489ef
commit 1a64ad682b
16 changed files with 3526 additions and 2886 deletions
--- a/src/numex.h
+++ b/src/numex.h
@@ -50,7 +50,8 @@ typedef enum {
 typedef enum {
    NUMEX_LEFT_CONTEXT_NONE,
    NUMEX_LEFT_CONTEXT_ADD,
-    NUMEX_LEFT_CONTEXT_MULTIPLY
+    NUMEX_LEFT_CONTEXT_MULTIPLY,
+    NUMEX_LEFT_CONTEXT_CONCAT_ONLY_IF_NUMBER
 } numex_left_context;

 typedef enum {