diff options
| author | Sven Gothel <[email protected]> | 2010-11-08 00:18:45 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-08 00:18:45 +0100 |
| commit | c2085bf795ca02e360341e8ab15c18c58ad6a6f8 (patch) | |
| tree | 4a61962b2386259bb119390584032f58e1a00527 | |
| parent | e024d6cab3b07ac2033630aac54e94d6494d8c5e (diff) | |
PCPP: Let '#error token' throw an exception with the message; Note: #warning needs to be quoted when having seperators
| -rw-r--r-- | src/java/com/jogamp/gluegen/pcpp/PCPP.java | 2 | ||||
| -rw-r--r-- | test/junit/com/jogamp/gluegen/PCPPTest.java | 6 | ||||
| -rw-r--r-- | test/junit/com/jogamp/gluegen/pcpptest.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/java/com/jogamp/gluegen/pcpp/PCPP.java b/src/java/com/jogamp/gluegen/pcpp/PCPP.java index db45e3e..f34a707 100644 --- a/src/java/com/jogamp/gluegen/pcpp/PCPP.java +++ b/src/java/com/jogamp/gluegen/pcpp/PCPP.java @@ -480,7 +480,7 @@ public class PCPP { private void handleError() throws IOException { String msg = nextWordOrString(); if (enabled()) { - LOG.log(WARNING, "#error {0} at \"{1}\" line \"{2}\"", new Object[]{msg, filename(), lineNumber()}); + throw new RuntimeException("#error "+msg+" at \""+filename()+"\" line "+lineNumber()); } } diff --git a/test/junit/com/jogamp/gluegen/PCPPTest.java b/test/junit/com/jogamp/gluegen/PCPPTest.java index ecaf7ec..b86116e 100644 --- a/test/junit/com/jogamp/gluegen/PCPPTest.java +++ b/test/junit/com/jogamp/gluegen/PCPPTest.java @@ -78,8 +78,10 @@ public class PCPPTest { "#126\"pcpptest.h\""+ " int GOOD_G;"+ "#128\"pcpptest.h\""+ - "#132\"pcpptest.h\""+ - "#134\"pcpptest.h\""; + "#130\"pcpptest.h\""+ + "#134\"pcpptest.h\""+ + "#136\"pcpptest.h\""; + output.flush(); String result = output.toString(); diff --git a/test/junit/com/jogamp/gluegen/pcpptest.h b/test/junit/com/jogamp/gluegen/pcpptest.h index 5a2d25a..e9ba181 100644 --- a/test/junit/com/jogamp/gluegen/pcpptest.h +++ b/test/junit/com/jogamp/gluegen/pcpptest.h @@ -125,6 +125,8 @@ int TEST_F_VAL2; int TEST_G_VAL; +#warning "Test warning with quotes - they must have quotes" + #ifdef __cplusplus } #endif |