Changeset ecb6ac32 in mainline for uspace/app/sbi/src/lex.c

Timestamp:

2010-04-04T22:32:39Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a72efc

Parents:

73060801 (diff), 23de644 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/sysel.

File:

• uspace/app/sbi/src/lex.c (modified) (6 diffs)

uspace/app/sbi/src/lex.c

@@ -34 +34 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "bigint.h"
 #include "mytypes.h"
 #include "input.h"
@@ -135 +136 @@
         { lc_assign,    "=" },
         { lc_plus,      "+" },
+        { lc_minus,     "-" },
+        { lc_mult,      "*" },
         { lc_increase,  "+=" },
 
@@ -205 +208 @@
                 break;
         case lc_lit_int:
-                printf("(%d)", lem->u.lit_int.value);
+                printf("(");
+                bigint_print(&lem->u.lit_int.value);
+                printf(")");
                 break;
         case lc_lit_string:
@@ -267 +272 @@
  *
  * @param lex           Lexer object.
+ * @return              Pointer to current lem. Owned by @a lex and only valid
+ *                      until next call to lex_next().
  */
 lem_t *lex_get_current(lex_t *lex)
@@ -376 +383 @@
                 lex->current.lclass = lc_plus; ++bp; break;
 
+        case '-':
+                lex->current.lclass = lc_minus; ++bp; break;
+
+        case '*':
+                lex->current.lclass = lc_mult; ++bp; break;
+
         case '<':
                 if (bp[1] == '=') {
@@ -458 +471 @@
 {
         char *bp;
-        int value;
+        bigint_t value;
+        bigint_t dgval;
+        bigint_t base;
+        bigint_t tprod;
 
         bp = lex->ibp;
-        value = 0;
+
+        bigint_init(&value, 0);
+        bigint_init(&base, 10);
 
         while (is_digit(*bp)) {
-                value = value * 10 + digit_value(*bp);
+                bigint_mul(&value, &base, &tprod);
+                bigint_init(&dgval, digit_value(*bp));
+
+                bigint_destroy(&value);
+                bigint_add(&tprod, &dgval, &value);
+                bigint_destroy(&tprod);
+                bigint_destroy(&dgval);
+
                 ++bp;
         }
 
+        bigint_destroy(&base);
+
         lex->ibp = bp;
 
         lex->current.lclass = lc_lit_int;
-        lex->current.u.lit_int.value = value;
+        bigint_shallow_copy(&value, &lex->current.u.lit_int.value);
 }