Merge remote-tracking branch 'upstream/master' into pulled

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
#	gradlew.bat
#	src/main/java/com/jogamp/gluegen/jcpp/MacroTokenSource.java
#	src/main/java/com/jogamp/gluegen/jcpp/Preprocessor.java
#	src/main/java/com/jogamp/gluegen/jcpp/SourceIterator.java
#	src/main/java/org/anarres/cpp/Main.java
#	src/test/java/com/jogamp/gluegen/jcpp/PragmaTest.java
#	src/test/java/com/jogamp/gluegen/jcpp/RegressionTest.java
#	src/test/java/com/jogamp/gluegen/jcpp/VaArgsPastingTest.java

2 files changed, 6 insertions, 0 deletions

diff --git a/src/test/java/com/jogamp/gluegen/jcpp/LexerSourceTest.java b/src/test/java/com/jogamp/gluegen/jcpp/LexerSourceTest.java
index 99324ff..4283073 100644
--- a/src/test/java/com/jogamp/gluegen/jcpp/LexerSourceTest.java
+++ b/src/test/java/com/jogamp/gluegen/jcpp/LexerSourceTest.java
@@ -144,4 +144,9 @@ public class LexerSourceTest extends SingletonJunitCase {
         testLexerSource("5 /*", false, NUMBER, WHITESPACE, INVALID);    // Bug #15
         testLexerSource("5 //", false, NUMBER, WHITESPACE, CPPCOMMENT);
     }
+
+    @Test
+    public void testUnicode()throws Exception{
+        testLexerSource("foo \u2018bar\u2019 baz", true, IDENTIFIER, WHITESPACE, 8216, IDENTIFIER, 8217, WHITESPACE, IDENTIFIER);
+    }
 }
diff --git a/src/test/java/com/jogamp/gluegen/jcpp/NumericValueTest.java b/src/test/java/com/jogamp/gluegen/jcpp/NumericValueTest.java
index 84a0ff1..036ee93 100644
--- a/src/test/java/com/jogamp/gluegen/jcpp/NumericValueTest.java
+++ b/src/test/java/com/jogamp/gluegen/jcpp/NumericValueTest.java
@@ -82,6 +82,7 @@ public class NumericValueTest extends SingletonJunitCase {
         testNumericValue("1e1", 1e1);
         // testNumericValue("-1e1", -1e1);
         testNumericValue("1e-1", 1e-1);
+        testNumericValue("1e+1", 1e+1);
 
         // Hex numbers with decimal exponents
         testNumericValue("0x12e3", 0x12e3);