Add storage->reportError to WavetableScriptEvaluator.cpp (#7674)

surge-synthesizer · Jun 25, 2024 · f0dc41c · f0dc41c
1 parent 9fea01a
commit f0dc41c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -31,6 +31,7 @@ Korridor <[email protected]>
 Mario Krušelj a.k.a. EvilDragon <http://github.com/mkruselj>
 muhl <https://github.com/mynameismuhl>
 Marty Lake <[email protected]>
+nuoun <https://github.com/nuoun>
 Luna Langton <https://github.com/selenologist>
 Jacky Ligon <http://jackyligon.com>
 Erik-Jan Maalderink <[email protected]>

diff --git a/src/common/dsp/WavetableScriptEvaluator.cpp b/src/common/dsp/WavetableScriptEvaluator.cpp
@@ -27,8 +27,8 @@ namespace Surge
 {
 namespace WavetableScript
 {
-std::vector<float> evaluateScriptAtFrame(const std::string &eqn, int resolution, int frame,
-                                         int nFrames)
+std::vector<float> evaluateScriptAtFrame(SurgeStorage *storage, const std::string &eqn,
+                                         int resolution, int frame, int nFrames)
 {
 #if HAS_LUA
     static lua_State *L = nullptr;
@@ -93,12 +93,24 @@ std::vector<float> evaluateScriptAtFrame(const std::string &eqn, int resolution,
                     lua_pop(L, 1);
                 }
             }
-            lua_pop(L, 1);
         }
+        else
+        {
+            // If pcr is not LUA_OK then lua pushes an error string onto the stack. Show this error
+            std::string luaerr = lua_tostring(L, -1);
+            if (storage)
+                storage->reportError(luaerr, "Wavetable Evaluator Runtime Error");
+            else
+                std::cerr << luaerr;
+        }
+        lua_pop(L, 1); // Error string or pcall result
     }
     else
     {
-        std::cout << emsg << std::endl;
+        if (storage)
+            storage->reportError(emsg, "Wavetable Evaluator Syntax Error");
+        else
+            std::cerr << emsg;
         lua_pop(L, 1);
     }
     return values;
@@ -107,8 +119,8 @@ std::vector<float> evaluateScriptAtFrame(const std::string &eqn, int resolution,
 #endif
 }
 
-bool constructWavetable(const std::string &eqn, int resolution, int frames, wt_header &wh,
-                        float **wavdata)
+bool constructWavetable(SurgeStorage *storage, const std::string &eqn, int resolution, int frames,
+                        wt_header &wh, float **wavdata)
 {
     auto wd = new float[frames * resolution];
     wh.n_samples = resolution;
@@ -118,7 +130,7 @@ bool constructWavetable(const std::string &eqn, int resolution, int frames, wt_h
 
     for (int i = 0; i < frames; ++i)
     {
-        auto v = evaluateScriptAtFrame(eqn, resolution, i, frames);
+        auto v = evaluateScriptAtFrame(storage, eqn, resolution, i, frames);
         memcpy(&(wd[i * resolution]), &(v[0]), resolution * sizeof(float));
     }
     return true;

diff --git a/src/common/dsp/WavetableScriptEvaluator.h b/src/common/dsp/WavetableScriptEvaluator.h
@@ -36,15 +36,15 @@ namespace WavetableScript
  * not at the evaluation or synthesis time. As such I expect you call it from
  * one thread at a time and just you know generally be careful.
  */
-std::vector<float> evaluateScriptAtFrame(const std::string &eqn, int resolution, int frame,
-                                         int nFrames);
+std::vector<float> evaluateScriptAtFrame(SurgeStorage *storage, const std::string &eqn,
+                                         int resolution, int frame, int nFrames);
 
 /*
  * Generate all the data required to call BuildWT. The wavdata here is data you
  * must free with delete[]
  */
-bool constructWavetable(const std::string &eqn, int resolution, int frames, wt_header &wh,
-                        float **wavdata);
+bool constructWavetable(SurgeStorage *storage, const std::string &eqn, int resolution, int frames,
+                        wt_header &wh, float **wavdata);
 
 std::string defaultWavetableFormula();
 

diff --git a/src/surge-testrunner/UnitTestsLUA.cpp b/src/surge-testrunner/UnitTestsLUA.cpp
@@ -665,6 +665,7 @@ TEST_CASE("Wavetable Script", "[formula]")
 {
     SECTION("Just The Sines")
     {
+        SurgeStorage storage;
         const std::string s = R"FN(
 function generate(config)
     res = config.xs
@@ -676,7 +677,7 @@ end
         )FN";
         for (int fno = 0; fno < 4; ++fno)
         {
-            auto fr = Surge::WavetableScript::evaluateScriptAtFrame(s, 512, fno, 4);
+            auto fr = Surge::WavetableScript::evaluateScriptAtFrame(nullptr, s, 512, fno, 4);
             REQUIRE(fr.size() == 512);
             auto dp = 1.0 / (512 - 1);
             for (int i = 0; i < 512; ++i)

diff --git a/src/surge-xt/gui/overlays/LuaEditors.cpp b/src/surge-xt/gui/overlays/LuaEditors.cpp
@@ -1119,7 +1119,7 @@ void WavetableEquationEditor::rerenderFromUIState()
         respt *= 2;
 
     renderer->points = Surge::WavetableScript::evaluateScriptAtFrame(
-        mainDocument->getAllContent().toStdString(), respt, cfr, nfr);
+        storage, mainDocument->getAllContent().toStdString(), respt, cfr, nfr);
     renderer->frameNumber = cfr;
     renderer->repaint();
 }
@@ -1142,8 +1142,8 @@ void WavetableEquationEditor::buttonClicked(juce::Button *button)
 
         wt_header wh;
         float *wd = nullptr;
-        Surge::WavetableScript::constructWavetable(mainDocument->getAllContent().toStdString(),
-                                                   respt, nfr, wh, &wd);
+        Surge::WavetableScript::constructWavetable(
+            storage, mainDocument->getAllContent().toStdString(), respt, nfr, wh, &wd);
         storage->waveTableDataMutex.lock();
         osc->wt.BuildWT(wd, wh, wh.flags & wtf_is_sample);
         osc->wavetable_display_name = "Scripted Wavetable";