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

Timestamp:

2010-03-07T17:45:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d0febca

Parents:

fa36f29

Message:

Update SBI to rev. 90.

File:

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

uspace/app/sbi/src/lex.c

@@ -35 +35 @@
 #include <stdlib.h>
 #include <string.h>
-#include "compat.h"
 #include "mytypes.h"
 #include "input.h"
+#include "os/os.h"
 #include "strtab.h"
 
@@ -44 +44 @@
 #define TAB_WIDTH 8
 
+static bool_t lex_next_try(lex_t *lex);
+
+static void lex_skip_comment(lex_t *lex);
 static void lex_skip_ws(lex_t *lex);
 static bool_t is_wstart(char c);
@@ -87 +90 @@
         { lc_nil,       "nil" },
         { lc_override,  "override" },
+        { lc_packed,    "packed" },
         { lc_private,   "private" },
         { lc_prop,      "prop" },
@@ -222 +226 @@
 void lex_next(lex_t *lex)
 {
+        bool_t got_lem;
+
+        do {
+                got_lem = lex_next_try(lex);
+        } while (got_lem == b_false);
+}
+
+/** Try reading next lexical element.
+ *
+ * @return @c b_true on success or @c b_false if it needs restarting.
+ */
+static bool_t lex_next_try(lex_t *lex)
+{
         char *bp;
 
@@ -240 +257 @@
                 /* End of input */
                 lex->current.lclass = lc_eof;
-                return;
+                return b_true;
         }
 
         if (is_wstart(bp[0])) {
                 lex_word(lex);
-                return;
+                return b_true;
         }
 
         if (is_digit(bp[0])) {
                 lex_number(lex);
-                return;
+                return b_true;
         }
 
         if (bp[0] == '"') {
                 lex_string(lex);
-                return;
+                return b_true;
+        }
+
+        if (bp[0] == '-' && bp[1] == '-') {
+                lex_skip_comment(lex);
+                return b_false;
         }
 
@@ -305 +327 @@
 
         lex->ibp = bp;
-        return;
+        return b_true;
 
 invalid:
@@ -311 +333 @@
         ++bp;
         lex->ibp = bp;
+
+        return b_true;
 }
 
@@ -340 +364 @@
         dp = keywords;
         while (dp->name != NULL) {
-                if (strcmp(ident_buf, dp->name) == 0) {
+                if (os_str_cmp(ident_buf, dp->name) == 0) {
                         /* Match */
                         lex->current.lclass = dp->lclass;
@@ -402 +426 @@
 
         lex->current.lclass = lc_lit_string;
-        lex->current.u.lit_string.value = strdup(strlit_buf);
-}
-
+        lex->current.u.lit_string.value = os_str_dup(strlit_buf);
+}
+
+/** Lex a single-line comment. */
+static void lex_skip_comment(lex_t *lex)
+{
+        char *bp;
+
+        bp = lex->ibp + 2;
+
+        while (*bp != '\n' && *bp != '\0') {
+                ++bp;
+        }
+
+        lex->ibp = bp;
+}
 
 /** Skip whitespace characters. */