Changeset 40477 for branches/czw_branch/20170908/Ohana/src/opihi/lib.shell/parse.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/parse.c (modified) (2 diffs)

branches/czw_branch/20170908/Ohana/src/opihi/lib.shell/parse.c

@@ -145 +145 @@
     /* simple variable assignment */
     /* dvomath returns a new string, or NULL, with the result of the expression */
+    /* if dvomath returns NULL, the expression was not a math operation: treat as a string */
     val = dvomath (1, &V1, &size, 0);
     if (val == NULL) { 
       while (OHANA_WHITESPACE (*V1)) V1++;
       val = strcreate (V1);
+      init_error ();
     } 
     // save the result
@@ -245 +247 @@
         vec[0].elements.Flt[Nx] = atof (val);
       } else {
-        vec[0].elements.Int[Nx] = atol (val);
+        vec[0].elements.Int[Nx] = atoll (val);
       }
     }