Changes in uspace/app/sbi/src/lex.c [051bc69a:38aaacc2] in mainline

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"
@@ -75 +74 @@
 /** 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_char,      "char" },
         { lc_builtin,   "builtin" },
-        { lc_char,      "char" },
         { 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" },
@@ -100 +96 @@
         { lc_is,        "is" },
         { lc_new,       "new" },
-        { lc_not,       "not" },
         { lc_nil,       "nil" },
-        { lc_or,        "or" },
         { lc_override,  "override" },
         { lc_packed,    "packed" },
@@ -239 +233 @@
 void lem_print_coords(lem_t *lem)
 {
-        cspan_print(lem->cspan);
+        printf("%d:%d", lem->line_no, lem->col_0);
 }
 
@@ -261 +255 @@
         lex->ibp = lex->inbuf;
         lex->col_adj = 0;
-        lex->prev_valid = b_false;
         lex->current_valid = b_true;
 }
@@ -286 +279 @@
  * @param lex           Lexer object.
  * @return              Pointer to current lem. Owned by @a lex and only valid
- *                      until next call to lex_xxx().
+ *                      until next call to lex_next().
  */
 lem_t *lex_get_current(lex_t *lex)
@@ -294 +287 @@
 }
 
-/** 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).
  *
@@ -334 +297 @@
         if (lex->current_valid == b_true)
                 return;
-
-        /* Copy previous lem */
-        lex->prev = lex->current;
-        lex->prev_valid = b_true;
 
         do {
@@ -359 +318 @@
 static bool_t lex_read_try(lex_t *lex)
 {
-        char *bp, *lsp;
-        int line0, col0;
+        char *bp;
 
         lex_skip_ws(lex);
@@ -370 +328 @@
          * separately using col_adj.
          */
-        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;
+        lex->current.line_no = input_get_line_no(lex->input);
+        lex->current.col_0 = 1 + lex->col_adj + (lex->ibp - lex->inbuf);
+
         bp = lex->ibp;
 
@@ -381 +336 @@
                 /* End of input */
                 lex->current.lclass = lc_eof;
-                goto finish;
+                return b_true;
         }
 
         if (is_wstart(bp[0])) {
                 lex_word(lex);
-                goto finish;
+                return b_true;
         }
 
         if (bp[0] == '\'') {
                 lex_char(lex);
-                goto finish;
+                return b_true;
         }
 
         if (is_digit(bp[0])) {
                 lex_number(lex);
-                goto finish;
+                return b_true;
         }
 
         if (bp[0] == '"') {
                 lex_string(lex);
-                goto finish;
+                return b_true;
         }
 
         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;
         }
@@ -467 +417 @@
 
         lex->ibp = bp;
-
-finish:
-        /* Compute ending column number */
-        lex->current.cspan->col1 = col0 + (lex->ibp - lsp) - 1;
         return b_true;