From bc79986dd28443db86e7f7434803b08ce2e2454b Mon Sep 17 00:00:00 2001
From: Felix Roos <roos@entrecode.de>
Date: Sun, 6 Feb 2022 23:02:43 +0100
Subject: [PATCH] now supporting tidal syntax directly

---
 repl/src/App.tsx        | 26 ++++++++++++++++++++++++--
 repl/src/CodeMirror.tsx |  1 +
 repl/src/parse.ts       |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/repl/src/App.tsx b/repl/src/App.tsx
index 5d90b2be..52d8bf82 100644
--- a/repl/src/App.tsx
+++ b/repl/src/App.tsx
@@ -24,6 +24,7 @@ synth.set({
 });
 
 function App() {
+  const [mode, setMode] = useState<string>('javascript');
   const [code, setCode] = useState<string>(tetrisHaskell);
   const [log, setLog] = useState('');
   const logBox = useRef<any>();
@@ -64,7 +65,17 @@ function App() {
   // parse pattern when code changes
   useEffect(() => {
     try {
-      const _pattern = parse(code);
+      let _pattern;
+      try {
+        _pattern = h(code);
+        setMode('pegjs'); // haskell mode does not recognize quotes, pegjs looks ok by accident..
+        // console.log('h _pattern', _pattern);
+      } catch (err) {
+        setMode('javascript');
+        // code is not haskell like
+        _pattern = parse(code);
+        // console.log('not haskell..', _pattern);
+      }
       setPattern(_pattern);
       // cycle.query(cycle.activeCycle()); // reschedule active cycle
       setError(undefined);
@@ -88,6 +99,11 @@ function App() {
           <div className={cx('h-full bg-slate-600', error ? 'focus:ring-red-500' : 'focus:ring-slate-800')}>
             <CodeMirror
               value={code}
+              options={{
+                mode,
+                theme: 'material',
+                lineNumbers: true,
+              }}
               onChange={(_: any, __: any, value: any) => {
                 setLog((log) => log + `${log ? '\n\n' : ''}✏️ edit\n${code}\n${value}`);
                 setCode(value);
@@ -110,7 +126,13 @@ function App() {
         >
           {cycle.started ? 'pause' : 'play'}
         </button>
-        <textarea className="grow bg-[#283237] border-0" value={log} readOnly ref={logBox} style={{ fontFamily: 'monospace' }} />
+        <textarea
+          className="grow bg-[#283237] border-0"
+          value={log}
+          readOnly
+          ref={logBox}
+          style={{ fontFamily: 'monospace' }}
+        />
       </section>
     </div>
   );
diff --git a/repl/src/CodeMirror.tsx b/repl/src/CodeMirror.tsx
index 515c0e3c..faef177e 100644
--- a/repl/src/CodeMirror.tsx
+++ b/repl/src/CodeMirror.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Controlled as CodeMirror2 } from 'react-codemirror2';
 import 'codemirror/mode/javascript/javascript.js';
+import 'codemirror/mode/pegjs/pegjs.js';
 import 'codemirror/theme/material.css';
 import 'codemirror/lib/codemirror.css';
 
diff --git a/repl/src/parse.ts b/repl/src/parse.ts
index 8cf15c51..c3e9bb21 100644
--- a/repl/src/parse.ts
+++ b/repl/src/parse.ts
@@ -96,6 +96,6 @@ export const mini = (...strings: string[]) => {
 // includes haskell style (raw krill parsing)
 export const h = (string: string) => {
   const ast = krill.parse(string);
-  console.log('ast', ast);
+  // console.log('ast', ast);
   return patternifyAST(ast);
 };