MonetDB: default - Merge with Dec2016 branch.

[Sjoerd Mullender]

Changeset: 2c88e2c85abb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c88e2c85abb
Modified Files:
        sql/server/sql_scan.c
        sql/test/pg_regress/Tests/comments.stable.err
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (47 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
@@ -824,10 +824,11 @@ skip_c_comment(struct scanner * lc)
        int depth = 1;
 
        lc->started = 1;
-       while ((cur = scanner_getc(lc)) != EOF && depth > 0) {
+       while (depth > 0 && (cur = scanner_getc(lc)) != EOF) {
                if (prev == '*' && cur == '/')
                        depth--;
                else if (prev == '/' && cur == '*') {
+                       /* block comments can nest */
                        cur = 0; /* prevent slash-star-slash from matching */
                        depth++;
                }
@@ -835,7 +836,8 @@ skip_c_comment(struct scanner * lc)
        }
        lc->yysval = lc->yycur;
        lc->started = started;
-       return cur;
+       /* a comment is equivalent to a newline */
+       return cur == EOF ? cur : '\n';
 }
 
 static int 
@@ -849,8 +851,7 @@ skip_sql_comment(struct scanner * lc)
                ;
        lc->yysval = lc->yycur;
        lc->started = started;
-       if (cur == '\n')
-               cur = scanner_getc(lc);
+       /* a comment is equivalent to a newline */
        return cur;
 }
 
diff --git a/sql/test/pg_regress/Tests/comments.stable.err 
b/sql/test/pg_regress/Tests/comments.stable.err
--- a/sql/test/pg_regress/Tests/comments.stable.err
+++ b/sql/test/pg_regress/Tests/comments.stable.err
@@ -30,7 +30,6 @@ stderr of test 'comments` in directory '
 # 17:48:13 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-5017" "--port=30983"
 # 17:48:13 >  
 
-        
 # 15:42:49 >  
 # 15:42:49 >  "Done."
 # 15:42:49 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list