logics-py==0.0.11, code reformat, minor fixes

viur-framework · Oct 27, 2023 · da6171b · da6171b
1 parent eb6ba2c
commit da6171b
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 148 deletions.
diff --git a/Makefile b/Makefile
@@ -14,5 +14,9 @@ $(LOGICS_JS): logics.par
 	unicc -swo $(patsubst %.js,%,$@) -l javascript $?
 	cd logics-js; npm i; npm run fmt
 
+test:
+	cd logics-py; pipenv install --dev; pipenv run test
+	cd logics-js; npm i; npm run test
+
 clean:
 	rm $(LOGICS_JS) $(LOGICS_PY)
diff --git a/README.md b/README.md
@@ -8,13 +8,13 @@
         <img src="https://img.shields.io/github/license/viur-framework/logics" alt="Badge displaying the license" title="License badge">
     </a>
     <a href="https://pypi.org/project/logics-py">
-        <img alt="Badge showing current PyPI version if logics-py" title="logics-py" src="https://img.shields.io/pypi/v/logics-py?label=logics-py">
+        <img alt="Badge showing current PyPI version of logics-py" title="logics-py" src="https://img.shields.io/pypi/v/logics-py?label=logics-py">
     </a>
     <a href="https://www.npmjs.com/package/logics-js">
-        <img alt="Badge showing current npm version if logics-js" title="logics-js" src="https://img.shields.io/npm/v/logics-js?label=logics-js">
+        <img alt="Badge showing current npm version of logics-js" title="logics-js" src="https://img.shields.io/npm/v/logics-js?label=logics-js">
     </a>
     <br>
-    A tiny, sandboxed, secure and extendable formula language with a flavor of Python.
+    A multi-platform, sandboxed and extendable expression language with a Python-like syntax.
 </div>
 
 ## About

diff --git a/logics-js/logics.js b/logics-js/logics.js
@@ -216,13 +216,11 @@ export default class Logics {
 
                         try {
                             stack.op0(fn(...args));
+                        } catch (e) {
+                            stack.op0(`#ERR:Invalid call to ${fname}()`);
                         }
-                        catch (e) {
-                            stack.op0(`#ERR:Invalid call to ${fname}()`)
-                        }
-
                     } else {
-                        stack.op0(`#ERR:Call to unknown function ${fname}()`)
+                        stack.op0(`#ERR:Call to unknown function ${fname}()`);
                     }
                 },
                 comprehension: () => {