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

Timestamp:

2010-05-08T08:10:44Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

640ffe6, c5cb943d

Parents:

25a76ab8

Message:

Update SBI to rev. 244.

File:

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

uspace/app/sbi/src/lex.c

@@ -35 +35 @@
 #include <stdlib.h>
 #include "bigint.h"
+#include "cspan.h"
 #include "mytypes.h"
 #include "input.h"
@@ -74 +75 @@
 /** Keyword names. Used both for printing and recognition. */
 static struct lc_name keywords[] = {
+        { lc_and,       "and" },
         { lc_as,        "as" },
         { lc_bool,      "bool" },
+        { lc_break,     "break" },
+        { lc_builtin,   "builtin" },
         { lc_char,      "char" },
-        { lc_builtin,   "builtin" },
         { lc_class,     "class" },
-        { lc_constructor,       "constructor" },
         { lc_deleg,     "deleg" },
         { lc_do,        "do" },
+        { lc_elif,      "elif" },
         { lc_else,      "else" },
         { lc_end,       "end" },
+        { lc_enum,      "enum" },
         { lc_except,    "except" },
         { lc_false,     "false" },
@@ -96 +100 @@
         { lc_is,        "is" },
         { lc_new,       "new" },
+        { lc_not,       "not" },
         { lc_nil,       "nil" },
+        { lc_or,        "or" },
         { lc_override,  "override" },
         { lc_packed,    "packed" },
@@ -233 +239 @@
 void lem_print_coords(lem_t *lem)
 {
-        printf("%d:%d", lem->line_no, lem->col_0);
+        cspan_print(lem->cspan);
 }
 
@@ -255 +261 @@
         lex->ibp = lex->inbuf;
         lex->col_adj = 0;
+        lex->prev_valid = b_false;
         lex->current_valid = b_true;
 }
@@ -279 +286 @@
  * @param lex           Lexer object.
  * @return              Pointer to current lem. Owned by @a lex and only valid
- *                      until next call to lex_next().
+ *                      until next call to lex_xxx().
  */
 lem_t *lex_get_current(lex_t *lex)
@@ -287 +294 @@
 }
 
+/** Get previous lem if valid.
+ *
+ * The returned pointer is invalidated by next call to lex_next()
+ *
+ * @param lex           Lexer object.
+ * @return              Pointer to previous lem. Owned by @a lex and only valid
+ *                      until next call to lex_xxx().
+ */
+lem_t *lex_peek_prev(lex_t *lex)
+{
+        if (lex->current_valid == b_false) {
+                /*
+                 * This means the head is advanced but next lem was not read.
+                 * Thus the previous lem is still in @a current.
+                 */
+                return &lex->current;
+        }
+
+        if (lex->prev_valid != b_true) {
+                /* Looks like we are still at the first lem. */
+                return NULL;
+        }
+
+        /*
+         * Current lem has been read in. Thus the previous lem was moved to
+         * @a previous.
+         */
+        return &lex->prev;
+}
+
 /** Read in the current lexical element (unless already read in).
  *
@@ -297 +334 @@
         if (lex->current_valid == b_true)
                 return;
+
+        /* Copy previous lem */
+        lex->prev = lex->current;
+        lex->prev_valid = b_true;
 
         do {
@@ -318 +359 @@
 static bool_t lex_read_try(lex_t *lex)
 {
-        char *bp;
+        char *bp, *lsp;
+        int line0, col0;
 
         lex_skip_ws(lex);
@@ -328 +370 @@
          * separately using col_adj.
          */
-        lex->current.line_no = input_get_line_no(lex->input);
-        lex->current.col_0 = 1 + lex->col_adj + (lex->ibp - lex->inbuf);
-
+        line0 = input_get_line_no(lex->input);
+        col0 = 1 + lex->col_adj + (lex->ibp - lex->inbuf);
+
+        lex->current.cspan = cspan_new(lex->input, line0, col0, line0, col0);
+
+        lsp = lex->ibp;
         bp = lex->ibp;
 
@@ -336 +381 @@
                 /* End of input */
                 lex->current.lclass = lc_eof;
-                return b_true;
+                goto finish;
         }
 
         if (is_wstart(bp[0])) {
                 lex_word(lex);
-                return b_true;
+                goto finish;
         }
 
         if (bp[0] == '\'') {
                 lex_char(lex);
-                return b_true;
+                goto finish;
         }
 
         if (is_digit(bp[0])) {
                 lex_number(lex);
-                return b_true;
+                goto finish;
         }
 
         if (bp[0] == '"') {
                 lex_string(lex);
-                return b_true;
+                goto finish;
         }
 
         if (bp[0] == '-' && bp[1] == '-') {
                 lex_skip_comment(lex);
+
+                /* Compute ending column number */
+                lex->current.cspan->col1 = col0 + (lex->ibp - lsp) - 1;
+
+                /* Try again */
                 return b_false;
         }
@@ -417 +467 @@
 
         lex->ibp = bp;
+
+finish:
+        /* Compute ending column number */
+        lex->current.cspan->col1 = col0 + (lex->ibp - lsp) - 1;
         return b_true;