processing-cpp
diff --git a/‎mode/CppMode.jar‎
38 Bytes b/‎mode/CppMode.jar‎
38 Bytes
diff --git a/‎src/Processing.cpp‎
Lines changed: 16 additions & 1 deletion b/‎src/Processing.cpp‎
Lines changed: 16 additions & 1 deletion
diff --git a/‎src/java/CppBuild.java‎
Lines changed: 1 addition & 1 deletion b/‎src/java/CppBuild.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/java/ErrorFormatter.java‎
Lines changed: 4 additions & 2 deletions b/‎src/java/ErrorFormatter.java‎
Lines changed: 4 additions & 2 deletions
@@ -3405,8 +3405,14 @@ void PApplet::run(){
         glfwSwapBuffers(w);
     });
     glfwMakeContextCurrent(gWindow);
-    glewExperimental = GL_TRUE; // required for core/compat profiles to load all function pointers
+    glewExperimental = GL_TRUE;
+#ifdef _WIN32
+    MessageBoxA(NULL, "Before glewInit", "Debug1", MB_OK);
+#endif
     GLenum glewErr = glewInit();
+#ifdef _WIN32
+    MessageBoxA(NULL, "After glewInit", "Debug2", MB_OK);
+#endif
     if(glewErr != GLEW_OK){
 #ifdef _WIN32
         char msg[256]; snprintf(msg,sizeof(msg),"glewInit() failed: %s", glewGetErrorString(glewErr));
@@ -3421,7 +3427,13 @@ void PApplet::run(){
     if(phongProg){glDeleteProgram(phongProg);phongProg=0;}
     glEnable(GL_BLEND);glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_DEPTH_TEST);
+#ifdef _WIN32
+    MessageBoxA(NULL, "After GL enable calls", "Debug3", MB_OK);
+#endif
     smooth();
+#ifdef _WIN32
+    MessageBoxA(NULL, "After smooth()", "Debug4", MB_OK);
+#endif
     // Don't call setProjection here -- let size() in this->setup() do it
     // with the correct dimensions. Calling it now with winWidth=640,winHeight=480
     // (defaults) would set the wrong ortho before this->setup() changes the size.
@@ -3499,6 +3511,9 @@ void PApplet::run(){
         }
     }
 
+#ifdef _WIN32
+    MessageBoxA(NULL, "Before glfwFocusWindow", "Debug5", MB_OK);
+#endif
     glfwFocusWindow(gWindow);  // ensure input focus on Windows
 
     // Settle loop: poll+swap several times BEFORE this->setup() runs so i3/tiling WMs
 
@@ -602,7 +602,7 @@ public File compile(RunnerListener listener) throws Exception {
     // Copy bundled macOS dylibs to sketch folder so the binary finds them at runtime.
     if (isMac) {
       String macArch2 = System.getProperty("os.arch","").contains("aarch64") ? "arm64" : "x64";
-      File macLibsDir2 = new File(runtimeDir.getParentFile(), "libs/macos"2);
+      File macLibsDir2 = new File(runtimeDir.getParentFile(), "libs/macos");
       if (macLibsDir2.exists()) {
         for (File dylib : macLibsDir2.listFiles((d,n) -> n.endsWith(".dylib"))) {
           File destDylib = new File(sketch.getFolder(), dylib.getName());
 
@@ -150,15 +150,17 @@ private static String fixNote(ParseException ex) {
     if (msg.contains("expected identifier") || msg.contains("expected a type name")) {
       String _d = msg.replaceAll(".*(?:but found|before) '(.+?)'.*", "$1");
       if (_d.length() > 0 && Character.isDigit(_d.charAt(0))) return "names cannot start with a digit";
-    }
       java.util.Set<String> KW = new java.util.HashSet<>(java.util.Arrays.asList(
         "for","while","if","else","switch","case","return","break","continue",
         "class","struct","namespace","template","typename","auto","void",
         "int","float","double","bool","char","long","short","unsigned","signed",
         "const","constexpr","static","inline","virtual","override","new","delete","this"));
       if (KW.contains(_d)) return "'"+_d+"' is a reserved keyword";
     }
-    if (msg.contains("expected ';' but found '") && msg.replaceAll(".*but found '(.+?)'.*", "$1").matches("[^a-zA-Z0-9_]+")) { String tok = msg.replaceAll(".*but found '(.+?)'.*", "$1"); return "invalid token '" + tok + "'"; }
+    if (msg.contains("expected ';' but found '")) {
+      String tok = msg.replaceAll(".*but found '(.+?)'.*", "$1");
+      if (tok.matches("[^a-zA-Z0-9_]+")) return "invalid token '" + tok + "'";
+    }
     if (msg.contains("expected ';'"))              return "missing ';' here";
     if (msg.contains("expected '(' before") || msg.contains("expected '(' but found"))  return "'(' is required after 'if'/'while'/'for'/'switch'";
     if (msg.contains("expected ')'"))                               return "missing ')' to close this";