Made '\' at end of C++ comments be a warning. It is line continuation for some versi...

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24396 e7fa87d3-cd2b-0410-9028-fcbf551c1848

diff --git a/Test/baseResults/comment.frag.out b/Test/baseResults/comment.frag.out
index 0daf757..c3a548c 100644 (file)
--- a/Test/baseResults/comment.frag.out
+++ b/Test/baseResults/comment.frag.out
@@ -1,5 +1,7 @@
 comment.frag\r
 Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.\r
+WARNING: 0:10: 'line continuation' : used at end of comment; the following line is still part of the comment \r
+WARNING: 0:12: 'line continuation' : used at end of comment; the following line is still part of the comment \r
 \r
 0:? Sequence\r
 0:17  Function Definition: main( (void)\r

diff --git a/Test/baseResults/lineContinuation.vert.out b/Test/baseResults/lineContinuation.vert.out
index 0982a25..344099b 100644 (file)
--- a/Test/baseResults/lineContinuation.vert.out
+++ b/Test/baseResults/lineContinuation.vert.out
@@ -1,4 +1,5 @@
 lineContinuation.vert\r
+WARNING: 0:3: 'line continuation' : used at end of comment; the following line is still part of the comment \r
 ERROR: 0:6: '#error' : e1  \r
 ERROR: 0:11: '#error' : e2  \r
 ERROR: 0:18: '#error' : e3  \r
@@ -25,6 +26,7 @@ ERROR: node is still EOpNull!
 0:25        'b' (highp 4-component vector of float)\r
 0:?   Linker Objects\r
 0:?     'foo' (highp float)\r
+0:?     'goodDecl' (highp int)\r
 0:?     'gl_VertexID' (gl_VertexId highp int)\r
 0:?     'gl_InstanceID' (gl_InstanceId highp int)\r
 \r

diff --git a/Test/baseResults/lineContinuation100.vert.out b/Test/baseResults/lineContinuation100.vert.out
index 9e20998..7519146 100644 (file)
--- a/Test/baseResults/lineContinuation100.vert.out
+++ b/Test/baseResults/lineContinuation100.vert.out
@@ -1,6 +1,6 @@
 lineContinuation100.vert\r
-ERROR: 0:3: 'line continuation' : not supported for this version or the enabled extensions \r
-ERROR: 0:6: '#error' : e1  \r
+WARNING: 0:3: 'line continuation' : used at end of comment, but this version does not provide line continuation \r
+ERROR: 0:4: '#error' : good error  \r
 ERROR: 0:8: 'line continuation' : not supported for this version or the enabled extensions \r
 ERROR: 0:11: '#error' : e2  \r
 ERROR: 0:13: 'line continuation' : not supported for this version or the enabled extensions \r
@@ -8,7 +8,7 @@ ERROR: 0:14: 'line continuation' : not supported for this version or the enabled
 ERROR: 0:15: 'line continuation' : not supported for this version or the enabled extensions \r
 ERROR: 0:18: '#error' : e3  \r
 ERROR: 0:24: 'line continuation' : not supported for this version or the enabled extensions \r
-ERROR: 9 compilation errors.  No code generated.\r
+ERROR: 8 compilation errors.  No code generated.\r
 \r
 \r
 ERROR: node is still EOpNull!\r

diff --git a/Test/lineContinuation.vert b/Test/lineContinuation.vert
index 7909bf2..a70b625 100644 (file)
--- a/Test/lineContinuation.vert
+++ b/Test/lineContinuation.vert
@@ -28,3 +28,9 @@ vec4 foo2(vec4 a)
 // aoeuntheo unatehutna \ antaehnathe 
 // anteonuth $ natohe " '
 // anteonuth     natohe
+
+#define FOO int /* \
+*/ goodDecl;
+
+FOO
+

diff --git a/Test/lineContinuation100.vert b/Test/lineContinuation100.vert
index 8b164e7..b68b715 100644 (file)
--- a/Test/lineContinuation100.vert
+++ b/Test/lineContinuation100.vert
@@ -1,9 +1,9 @@
 #version 100\r
 \r
-// this file cont\\r
-ains no errors other than the #error which are there to see if line numbering for errors is correct\r
+// non-line continuation comment \\r
+#error good error\r
+\r
 \r
-#error e1\r
 \r
 float f\\r
 oo;  // same as 'float foo;'\r

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 8d866e5..396267d 100644 (file)
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -9,5 +9,5 @@
 // source have to figure out how to create revision.h just to get a build\r
 // going.  However, if it is not updated, it can be a version behind.\r
 \r
-#define GLSLANG_REVISION "24390"\r
-#define GLSLANG_DATE     "2013/12/06 11:19:22"\r
+#define GLSLANG_REVISION "24391"\r
+#define GLSLANG_DATE     "2013/12/06 11:24:47"\r

diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 9d80e3e..cd15136 100644 (file)
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -1410,13 +1410,22 @@ void TParseContext::reservedPpErrorCheck(TSourceLoc loc, const char* identifier,
 //
 // See if this version/profile allows use of the line-continuation character '\'.
 //
-void TParseContext::lineContinuationCheck(TSourceLoc loc)
+bool TParseContext::lineContinuationCheck(TSourceLoc loc, bool endOfComment)
 {
-    if ((profile == EEsProfile && version >= 300) ||
-        (profile != EEsProfile && version >= 420))
-        return;
-
     const char* message = "line continuation";
+
+    bool lineContinuationAllowed = (profile == EEsProfile && version >= 300) ||
+                                   (profile != EEsProfile && version >= 420);
+
+    if (endOfComment) {
+        if (lineContinuationAllowed)
+            warn(loc, "used at end of comment; the following line is still part of the comment", message, "");
+        else
+            warn(loc, "used at end of comment, but this version does not provide line continuation", message, "");
+
+        return lineContinuationAllowed;
+    }
+
     if (messages & EShMsgRelaxedErrors) {
         warn(loc, "not allowed in this version", message, "");
     } else {

diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h
index ca4778e..ddbf0f7 100644 (file)
--- a/glslang/MachineIndependent/ParseHelper.h
+++ b/glslang/MachineIndependent/ParseHelper.h
@@ -76,7 +76,7 @@ public:
                       const char *szExtraInfoFormat, ...);
     bool reservedErrorCheck(TSourceLoc, const TString&);
     void reservedPpErrorCheck(TSourceLoc, const char* name, const char* op);
-    void lineContinuationCheck(TSourceLoc);
+    bool lineContinuationCheck(TSourceLoc, bool endOfComment);
     bool builtInName(const TString&);
 
     void handlePragma(TSourceLoc, const TVector<TString>&);

diff --git a/glslang/MachineIndependent/preprocessor/Pp.cpp b/glslang/MachineIndependent/preprocessor/Pp.cpp
index 30df403..9214c7f 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -191,7 +191,7 @@ int TPpContext::CPPdefine(TPpToken* ppToken)
     mac.body = new TokenStream;
     while (token != '\n') {
         if (token == '\\') {
-            parseContext.lineContinuationCheck(ppToken->loc);
+            parseContext.lineContinuationCheck(ppToken->loc, false);
             token = currentInput->scan(this, currentInput, ppToken);
             if (token == '\n' || token == '\r')
                 token = currentInput->scan(this, currentInput, ppToken);

diff --git a/glslang/MachineIndependent/preprocessor/PpScanner.cpp b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
index c62fff0..d29ac10 100644 (file)
--- a/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+++ b/glslang/MachineIndependent/preprocessor/PpScanner.cpp
@@ -285,7 +285,7 @@ int TPpContext::sourceScan(TPpContext* pp, InputSrc*, TPpToken* ppToken)
             do {
                 if (ch == '\\') {
                     // escaped character
-                    pp->parseContext.lineContinuationCheck(ppToken->loc);
+                    pp->parseContext.lineContinuationCheck(ppToken->loc, false);
                     ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
                     if (ch == '\r' || ch == '\n') {
                         int nextch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
@@ -641,12 +641,15 @@ int TPpContext::sourceScan(TPpContext* pp, InputSrc*, TPpToken* ppToken)
                         // allow an escaped newline, otherwise escapes in comments are meaningless
                         ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
                         if (ch == '\r' || ch == '\n') {
-                            pp->parseContext.lineContinuationCheck(ppToken->loc);
-                            int nextch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
-                            if (ch == '\r' && nextch == '\n')
-                                ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
-                            else
-                                ch = nextch;
+                            if (! pp->parseContext.lineContinuationCheck(ppToken->loc, true))
+                                pp->currentInput->ungetch(pp, pp->currentInput, ch, ppToken);
+                            else {
+                                int nextch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
+                                if (ch == '\r' && nextch == '\n')
+                                    ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
+                                else
+                                    ch = nextch;
+                            }
                         }
                     }
                 } while (ch != '\n' && ch != EOF);
@@ -684,7 +687,7 @@ int TPpContext::sourceScan(TPpContext* pp, InputSrc*, TPpToken* ppToken)
             ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
             while (ch != '"' && ch != '\n' && ch != EOF) {
                 if (ch == '\\') {                    
-                    pp->parseContext.lineContinuationCheck(ppToken->loc);
+                    pp->parseContext.lineContinuationCheck(ppToken->loc, false);
                     ch = pp->currentInput->getch(pp, pp->currentInput, ppToken);
                     if (ch == '\n' || ch == '\r' || ch == EOF)
                         break;