MonetDB: Jan2022 - Refactor/improve some EOF checks.

[Aris Koning]

Changeset: 3e9860f4cea5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3e9860f4cea5
Modified Files:
        sql/server/sql_scan.c
Branch: Jan2022
Log Message:

Refactor/improve some EOF checks.


diffs (24 lines):

diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -914,8 +914,6 @@ number(mvc * c, int cur)
         * parsed number (which may be the first causing it not to be a number);
         * it token == 0 after this block, a parse error was detected */
        if (cur == '0' && (cur = scanner_getc(lc)) == 'x') {
-               if (cur == EOF)
-                       return cur;
                cur = scanner_getc(lc);
                while (cur != EOF && iswxdigit(cur)) {
                        token = HEXADECIMAL;
@@ -935,9 +933,9 @@ number(mvc * c, int cur)
                while (cur != EOF && iswdigit(cur)) {
                        token = sqlINT;
                        cur = scanner_getc(lc);
-                       if (cur == EOF)
-                               return cur;
                }
+               if (cur == EOF)
+                       return cur;
                if (cur == '@') {
                        if (token == sqlINT) {
                                cur = scanner_getc(lc);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org