cleaning

Author: sdingcn

README.md

@@ -1,21 +1,19 @@
 # clo
 
 ![](https://github.com/sdingcn/clo/actions/workflows/CI.yml/badge.svg)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/sdingcn/clo)
 
 **Clo** is a small, dynamically-typed, garbage-collected, functional programming language.
-Here is its syntax.
 ```
 <comment>   := "#" [^\n]* "\n"
 <intrinsic> := "." [^\s]+
 <binding>   := <var> <expr>
+<callee>    := <intrinsic> | <expr>
 <expr>      := <int-literal> | <str-literal> | <var>
             |  lambda ( <var>* ) <expr>
             |  letrec ( <binding>* ) <expr>
             |  if <expr> <expr> <expr>
             |  { <expr>+ }  // sequenced evaluation
-            |  ( <intrinsic> <expr>* )
-            |  ( <expr> <expr>* )
+            |  ( <callee> <expr>* )
             |  @ <var> <expr>  // access var in closure's env (can simulate structs)
 ```
 
@@ -49,7 +47,7 @@ The source code of the interpreter
 is standard C++20 and thus can be compiled
 by any C++20-conforming compiler.
 The current `Makefile` and `CI.py`
-need `clang++` (with C++20 support), `make`, and `python3`.
+need `clang++` with C++20 support (for sanitizer), `make`, and `python3`.
 
 ## build and run
 

src/main.cpp

@@ -1777,34 +1777,29 @@ class State {
                 while (sin >> word) {
                     sentence.push_back(word);
                     // special treatment of string values
-                    // TODO: change this to a better implementation
-                    if (word == "(") {
+                    if (word == "sval" && sentence.size() > 1 && *(sentence.rbegin() + 1) == "(") {
                         sin >> word;
                         sentence.push_back(word);
-                        if (word == "sval") {
-                            sin >> word;
-                            sentence.push_back(word);
-                            int len = std::stoi(word);
-                            while (true) {
-                                if (sin.get() == '"') {
-                                    break;
-                                }
-                                if (sin.eof()) {
-                                    utils::panic("serialization", "didn't find start of str val");
-                                }
+                        int len = std::stoi(word);
+                        while (true) {
+                            if (sin.get() == '"') {
+                                break;
                             }
-                            word = "\"";
-                            for (int i = 0; i < len - 1; i++) {
-                                word.push_back(sin.get());
-                                if (sin.eof()) {
-                                    utils::panic("serialization", "incomplete string");
-                                }
+                            if (sin.eof()) {
+                                utils::panic("serialization", "didn't find start of str val");
                             }
-                            if (word.back() != '\"') {
-                                utils::panic("serialization", "invalid string terminator");
+                        }
+                        word = "\"";
+                        for (int i = 0; i < len - 1; i++) {
+                            word.push_back(sin.get());
+                            if (sin.eof()) {
+                                utils::panic("serialization", "incomplete string");
                             }
-                            sentence.push_back(word);
                         }
+                        if (word.back() != '"') {
+                            utils::panic("serialization", "invalid string terminator");
+                        }
+                        sentence.push_back(word);
                     }
                 }
             }
@@ -2179,6 +2174,7 @@ class State {
     const syntax::ExprNode* getExpr() const {
         return expr;
     }
+    // TODO: record GC state?
     std::string serialize() const {
         // std::string source;
         std::string serializedSource =