Changeset 2801 for trunk/Ohana/src/opihi/lib.shell/parse.c

Timestamp:

Dec 23, 2004, 7:36:01 AM (22 years ago)

Author:

eugene

Message:

fixed dvomath for strings

File:

• trunk/Ohana/src/opihi/lib.shell/parse.c (modified) (4 diffs)

trunk/Ohana/src/opihi/lib.shell/parse.c

@@ -56 +56 @@
     if (*V1 == 0) goto error;
 
+    /* command replacement.  execute the line, place answer in val. */
     if (*V1 == '`') {
-      /* command replacement.  execute the line, place answer in val. */
 
       /* look for end of line, must be ` */
@@ -79 +79 @@
         if (*B == '\n') *B = ' ';
       }
-    } else {
+    } 
+
+    /* simple variable assignment */
+    if (*V1 != '`') {
       /* dvomath returns a new string, or NULL, with the result of the expression */
       val = dvomath (1, &V1, &size, 0);
@@ -107 +110 @@
     V = strncreate (N+1, L - N - 1);
 
-    /* expand value in parenthesis */
+    /* expand value in brackets */
     val = dvomath (1, &V, &size, 0);
     if (val == NULL) {
@@ -172 +175 @@
     *c1 = 0;
 
-    /* value in brackets must be an expression of some sort */
+    /* value in brackets must be a math expression of some sort.
+       isolated words are not valid here */
     val = dvomath (1, &L, &size, -1);
     if (val == NULL) {