MonetDB: Oct2010 - Small cleanup of scanner

[Niels Nes]

Changeset: 655d4ff0f17c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=655d4ff0f17c
Modified Files:
        sql/src/server/sql_scan.mx
Branch: Oct2010
Log Message:

Small cleanup of scanner


diffs (51 lines):

diff -r 535a32aead3d -r 655d4ff0f17c sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx        Thu Oct 14 10:15:34 2010 +0200
+++ b/sql/src/server/sql_scan.mx        Thu Oct 14 22:33:41 2010 +0200
@@ -778,7 +778,8 @@
        int next = 0;
        int started = lc->started;
 
-       if (cur == '/') {
+       switch (cur) {
+       case '/':
                lc->started = 1;
                next = scanner_getc(lc);
                if (next == '*') {
@@ -789,16 +790,24 @@
                        utf8_putchar(lc, next); 
                        return scanner_token(lc, cur);
                }
-       } else if (isdigit(cur)) {
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
                return number(c, cur);
-       } else if (cur == '#') {
+       case '#':
                if ((cur = skip_sql_comment(lc)) == EOF)
                        return cur;
                return tokenize(c, cur);
-       } else if (cur == '\'' || cur == '"') {
+       case '\'':
+       case '"':
                return scanner_string(c, cur);
-       }
-       switch (cur) {
        case '-':
                lc->started = 1;
                next = scanner_getc(lc);
@@ -817,7 +826,6 @@
        case '^':
        case '+':
        case '&':
-       case '/':
        case '(':
        case ')':
        case ',':
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list