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

Timestamp:

2010-03-26T21:55:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4204ad9

Parents:

b535aeb

Message:

Update SBI to rev. 144.

File:

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

uspace/app/sbi/src/lex.c

@@ -44 +44 @@
 #define TAB_WIDTH 8
 
-static bool_t lex_next_try(lex_t *lex);
+static void lex_touch(lex_t *lex);
+static bool_t lex_read_try(lex_t *lex);
 
 static void lex_skip_comment(lex_t *lex);
@@ -72 +73 @@
 /** Keyword names. Used both for printing and recognition. */
 static struct lc_name keywords[] = {
+        { lc_as,        "as" },
+        { lc_builtin,   "builtin" },
         { lc_class,     "class" },
         { lc_constructor,       "constructor" },
@@ -96 +99 @@
         { lc_public,    "public" },
         { lc_raise,     "raise" },
+        { lc_resource,  "resource" },
         { lc_return,    "return" },
         { lc_self,      "self" },
@@ -221 +225 @@
         lex->ibp = lex->inbuf;
         lex->col_adj = 0;
-}
-
-/** Read next lexical element. */
+        lex->current_valid = b_true;
+}
+
+/** Advance to next lexical element.
+ *
+ * The new element be read in lazily then it is actually accessed.
+ */
 void lex_next(lex_t *lex)
 {
+        /* Make sure the current lem has already been read in. */
+        lex_touch(lex);
+
+        /* Force a new lem to be read on next access. */
+        lex->current_valid = b_false;
+}
+
+/** Get current lem.
+ *
+ * The returned pointer is invalidated by next call to lex_next()
+ */
+lem_t *lex_get_current(lex_t *lex)
+{
+        lex_touch(lex);
+        return &lex->current;
+}
+
+/** Read in the current lexical element (unless already read in). */
+static void lex_touch(lex_t *lex)
+{
         bool_t got_lem;
 
+        if (lex->current_valid == b_true)
+                return;
+
         do {
-                got_lem = lex_next_try(lex);
+                got_lem = lex_read_try(lex);
         } while (got_lem == b_false);
+
+        lex->current_valid = b_true;
 }
 
@@ -237 +270 @@
  * @return @c b_true on success or @c b_false if it needs restarting.
  */
-static bool_t lex_next_try(lex_t *lex)
+static bool_t lex_read_try(lex_t *lex)
 {
         char *bp;