Changes in uspace/app/sbi/src/lex.c [074444f:23de644] in mainline

File:

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

uspace/app/sbi/src/lex.c

@@ -53 +53 @@
 static bool_t is_digit(char c);
 static void lex_word(lex_t *lex);
-static void lex_char(lex_t *lex);
 static void lex_number(lex_t *lex);
 static void lex_string(lex_t *lex);
@@ -75 +74 @@
 static struct lc_name keywords[] = {
         { lc_as,        "as" },
-        { lc_bool,      "bool" },
-        { lc_char,      "char" },
         { lc_builtin,   "builtin" },
         { lc_class,     "class" },
@@ -84 +81 @@
         { lc_end,       "end" },
         { lc_except,    "except" },
-        { lc_false,     "false" },
         { lc_finally,   "finally" },
         { lc_for,       "for" },
@@ -112 +108 @@
         { lc_then,      "then" },
         { lc_this,      "this" },
-        { lc_true,      "true" },
         { lc_var,       "var" },
         { lc_with,      "with" },
@@ -343 +338 @@
         }
 
-        if (bp[0] == '\'') {
-                lex_char(lex);
-                return b_true;
-        }
-
         if (is_digit(bp[0])) {
                 lex_number(lex);
@@ -470 +460 @@
         lex->current.lclass = lc_ident;
         lex->current.u.ident.sid = strtab_get_sid(ident_buf);
-}
-
-/** Lex a character literal.
- *
- * Reads in a character literal and stores it in the current lem in @a lex.
- *
- * @param lex           Lexer object.
- */
-static void lex_char(lex_t *lex)
-{
-        char *bp;
-        int idx;
-        size_t len;
-        int char_val;
-
-        bp = lex->ibp + 1;
-        idx = 0;
-
-        while (bp[idx] != '\'') {
-                if (idx >= SLBUF_SIZE) {
-                        printf("Error: Character literal too long.\n");
-                        exit(1);
-                }
-
-                if (bp[idx] == '\0') {
-                        printf("Error: Unterminated character literal.\n");
-                        exit(1);
-                }
-
-                strlit_buf[idx] = bp[idx];
-                ++idx;
-        }
-
-        lex->ibp = bp + idx + 1;
-
-        strlit_buf[idx] = '\0';
-        len = os_str_length(strlit_buf);
-        if (len != 1) {
-                printf("Character literal should contain one character, "
-                    "but contains %u characters instead.\n", (unsigned) len);
-                exit(1);
-        }
-
-        os_str_get_char(strlit_buf, 0, &char_val);
-        lex->current.lclass = lc_lit_char;
-        bigint_init(&lex->current.u.lit_char.value, char_val);
 }