diff --git a/README.md b/README.md index 69e204d5..7c2a7a71 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The playground depends on the components library which then depends on the langu # Develop -For any project in the repo (`packages/`), begin by running `yarn` in the top level (TODO: is this true?) +For any project in the repo (`packages/*`), begin by running `yarn` in the top level. ``` sh yarn diff --git a/syntax/README.md b/spec/README.md similarity index 100% rename from syntax/README.md rename to spec/README.md diff --git a/syntax/default.nix b/spec/default.nix similarity index 97% rename from syntax/default.nix rename to spec/default.nix index e164fdff..cdf9909c 100644 --- a/syntax/default.nix +++ b/spec/default.nix @@ -13,7 +13,7 @@ let deps = [ in stdenv.mkDerivation { name = "render_squiggle-spec"; - src = ./spec; + src = ./src; buildInputs = deps; buildPhase = '' echo rendering... diff --git a/syntax/spec/appendix.tex b/spec/src/appendix.tex similarity index 100% rename from syntax/spec/appendix.tex rename to spec/src/appendix.tex diff --git a/syntax/spec/biblio.bib b/spec/src/biblio.bib similarity index 94% rename from syntax/spec/biblio.bib rename to spec/src/biblio.bib index 3c197cee..fd784f41 100644 --- a/syntax/spec/biblio.bib +++ b/spec/src/biblio.bib @@ -16,7 +16,7 @@ url = {https://craftinginterpreters.com/contents.html} } @article{@SqgSequence, - author = {Ozzie Gooen, Nuno Sempere}, + author = {Ozzie Gooen and Nuno Sempere}, title = {Squiggle (Sequence)}, year = {2020}, url = {https://www.lesswrong.com/s/rDe8QE5NvXcZYzgZ3} diff --git a/syntax/spec/introduction.tex b/spec/src/introduction.tex similarity index 93% rename from syntax/spec/introduction.tex rename to spec/src/introduction.tex index c949e506..8114d717 100644 --- a/syntax/spec/introduction.tex +++ b/spec/src/introduction.tex @@ -6,7 +6,7 @@ The current document is a formal description of the syntax that Squiggle will ta For an informal story of what we are about to see, consult \cite{@SqgCodePlan}. -We proceed by a BNF (\cite{@BNFWiki}), and take nods about how to communicate about programming languages from \cite{@CraftingInterpreters}, neglecting lessons from \cite{@PFPL}. +We proceed by a BNF (\cite{@BNFWiki}), and take nods about how to communicate about programming languages from \cite{@CraftingInterpreters, Appendix I}, neglecting lessons from \cite{@PFPL}. \subsection{Design goals} diff --git a/syntax/spec/main.tex b/spec/src/main.tex similarity index 100% rename from syntax/spec/main.tex rename to spec/src/main.tex diff --git a/syntax/spec/semantics.tex b/spec/src/semantics.tex similarity index 100% rename from syntax/spec/semantics.tex rename to spec/src/semantics.tex diff --git a/syntax/spec/syntax.tex b/spec/src/syntax.tex similarity index 74% rename from syntax/spec/syntax.tex rename to spec/src/syntax.tex index a5086172..6987b895 100644 --- a/syntax/spec/syntax.tex +++ b/spec/src/syntax.tex @@ -9,6 +9,7 @@ At a high level, we will first be slightly dishonest because the different types \subsection{THE FOLLOWING IS HERE FOR TEMPLATE SO I DON'T FORGET HOW TO BNF IN LATEX. } + In regex notation, we provide the following means of describing literals as well as the specification of the constants T and F. \begin{center} \begin{tabular}{c c c} @@ -23,7 +24,6 @@ In regex notation, we provide the following means of describing literals as well \end{center} \label{tab:atomsregex} -Additionally, we have builtins as follows, (with semantics given in \ref{section:dynamics}). \textbf{Morgan: should a let ast node be in this list of builtins??} \begin{grammar} ::= "AddInteger" \alt "SubtractInteger" \alt "MultiplyInteger" @@ -41,11 +41,4 @@ Additionally, we have builtins as follows, (with semantics given in \ref{section \alt "EqualsData" \alt "MkPairData" \alt "MkNilData" \alt "MkNilPairData" \end{grammar} -Many of which have syntax sugars for infix application, like so -\begin{grammar} - ::= - "+i" \alt "-i" \alt "*i" \alt "/i" \alt "//i" \alt $\%$"i" \alt "==i" \alt "lti" \alt $\leq$"i" \alt "+b" \alt ":b" \alt "!b" \alt "==b" \alt "ltb" \alt $\leq$"b" \alt "+s" \alt "==s" \alt "==d" -\end{grammar} -\textit{Sorry, having trouble getting lessthan sign to render rn}. In the small step dynamics given in \ref{section:dynamics}, only abstract syntax (i.e. $$) will be provided, not concrete syntax (i.e. including sugar). - \end{document}