Realign to original 1

.gitignore

@@ -22,3 +22,5 @@ GRTAGS
 logs
 old
 tmp/
+
+.vscode

Makefile.impls

@@ -20,6 +20,8 @@ d_MODE = gdc
 haxe_MODE = neko
 # octave or matlab
 matlab_MODE = octave
+# gm2 or m2lang
+modula2_MODE = gm2
 # python, python2 or python3
 python_MODE = python
 # scheme (chibi, kawa, gauche, chicken, sagittarius, cyclone, foment)
@@ -34,10 +36,10 @@ wasm_MODE = wasmtime
 # Implementation specific settings
 #
 
-IMPLS = ada ada.2 awk bash basic bbc-basic c c.2 chuck clojure coffee common-lisp cpp crystal cs d dart \
+IMPLS = ada ada.2 awk bash basic bbc-basic c c.2 chuck clojure coffee common-lisp cpp cpp.2 crystal cs d dart \
  elisp elixir elm erlang es6 factor fantom fennel forth fsharp go groovy gnu-smalltalk \
  guile haskell haxe hy io janet java java-truffle js jq julia kotlin livescript logo lua make mal \
- matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
+ matlab miniMAL modula2 nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
  plsql powershell prolog ps purs python python.2 r racket rexx rpython ruby ruby.2 rust scala scheme skew sml \
  swift swift3 swift4 swift5 tcl ts vala vb vhdl vimscript wasm wren yorick xslt zig
 
@@ -117,6 +119,7 @@ clojure_STEP_TO_PROG = $(clojure_STEP_TO_PROG_$(clojure_MODE))
 coffee_STEP_TO_PROG = impls/coffee/$($(1)).coffee
 common-lisp_STEP_TO_PROG = impls/common-lisp/$($(1))
 cpp_STEP_TO_PROG = impls/cpp/$($(1))
+cpp.2_STEP_TO_PROG = impls/cpp.2/$($(1))
 crystal_STEP_TO_PROG = impls/crystal/$($(1))
 cs_STEP_TO_PROG = impls/cs/$($(1)).exe
 d_STEP_TO_PROG = impls/d/$($(1))
@@ -153,6 +156,7 @@ make_STEP_TO_PROG = impls/make/$($(1)).mk
 mal_STEP_TO_PROG = impls/mal/$($(1)).mal
 matlab_STEP_TO_PROG = impls/matlab/$($(1)).m
 miniMAL_STEP_TO_PROG = impls/miniMAL/$($(1)).json
+modula2_STEP_TO_PROG = impls/modula2/$($(1)).mod
 nasm_STEP_TO_PROG = impls/nasm/$($(1))
 nim_STEP_TO_PROG = impls/nim/$($(1))
 objc_STEP_TO_PROG = impls/objc/$($(1))

impls/.gitignore

@@ -31,6 +31,8 @@ package-lock.json
 */mal
 */notes
 
+.vscode
+
 logs
 old
 

impls/cpp.2/.gitignore

@@ -0,0 +1,5 @@
+.deps
+*.o
+*.a
+bin
+bin/*

impls/cpp.2/Makefile

@@ -0,0 +1,74 @@
+CC=g++
+FLAGS=-g -Wall -Werror -Wextra
+INC=includes/
+BIN=bin
+LIBS=-lreadline -lgmpxx -lgmp
+
+step0_repl: step0_repl.cpp lineedit
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) step0_repl.cpp $(BIN)/lineedit.o -o $(BIN)/step0_repl
+
+step1_read_print: step1_read_print.cpp lineedit reader printer types parse_numbers parse_sequences parse_reader_macros
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) step1_read_print.cpp \
+$(BIN)/lineedit.o $(BIN)/reader.o $(BIN)/types.o $(BIN)/printer.o \
+$(BIN)/parse_numbers.o $(BIN)/parse_sequences.o $(BIN)/parse_reader_macros.o \
+-o $(BIN)/step1_read_print
+
+step2_eval: step2_eval.cpp lineedit reader printer types parse_numbers parse_sequences parse_reader_macros eval env apply core
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) step2_eval.cpp \
+$(BIN)/lineedit.o $(BIN)/reader.o $(BIN)/types.o $(BIN)/printer.o \
+$(BIN)/parse_numbers.o $(BIN)/parse_sequences.o $(BIN)/parse_reader_macros.o \
+$(BIN)/eval.o $(BIN)/env.o $(BIN)/apply.o $(BIN)/core.o \
+-o $(BIN)/step2_eval
+
+
+step3_env: step3_env.cpp lineedit reader printer types parse_numbers parse_sequences parse_reader_macros eval env apply core
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) step3_env.cpp \
+$(BIN)/lineedit.o $(BIN)/reader.o $(BIN)/types.o $(BIN)/printer.o \
+$(BIN)/parse_numbers.o $(BIN)/parse_sequences.o $(BIN)/parse_reader_macros.o \
+$(BIN)/eval.o $(BIN)/env.o $(BIN)/apply.o $(BIN)/core.o \
+-o $(BIN)/step3_env
+
+
+
+step4_if_fn_do: step4_if_fn_do.cpp lineedit reader printer types parse_numbers parse_sequences parse_reader_macros eval env apply core
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) step4_if_fn_do.cpp \
+$(BIN)/lineedit.o $(BIN)/reader.o $(BIN)/types.o $(BIN)/printer.o \
+$(BIN)/parse_numbers.o $(BIN)/parse_sequences.o $(BIN)/parse_reader_macros.o \
+$(BIN)/eval.o $(BIN)/env.o $(BIN)/apply.o $(BIN)/core.o \
+-o $(BIN)/step4_if_fn_do
+
+
+core: core.cpp types env apply
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c core.cpp -o $(BIN)/core.o
+
+eval: eval.cpp types env apply
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c eval.cpp -o $(BIN)/eval.o
+
+apply: apply.cpp types env
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c apply.cpp -o $(BIN)/apply.o
+
+env: env.cpp types
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c env.cpp -o $(BIN)/env.o
+
+
+printer: printer.cpp $(INC)/printer.h types
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c printer.cpp -o $(BIN)/printer.o
+
+
+reader: reader.cpp $(INC)/reader.h lineedit types parse_numbers parse_sequences parse_reader_macros
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c reader.cpp -o $(BIN)/reader.o
+
+parse_reader_macros: parse_reader_macros.cpp $(INC)/parse_reader_macros.h types
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c parse_reader_macros.cpp -o $(BIN)/parse_reader_macros.o
+
+parse_sequences: parse_sequences.cpp $(INC)/parse_sequences.h types
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c parse_sequences.cpp -o $(BIN)/parse_sequences.o
+
+parse_numbers: parse_numbers.cpp $(INC)/parse_numbers.h types
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c parse_numbers.cpp -o $(BIN)/parse_numbers.o
+
+types: types.cpp $(INC)/types.h lineedit
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c types.cpp -o $(BIN)/types.o
+
+lineedit: lineedit.cpp $(INC)/lineedit.h
+ $(CC) $(FLAGS) -I$(INC) $(LIBS) -c lineedit.cpp -o $(BIN)/lineedit.o

impls/cpp.2/apply.cpp

@@ -0,0 +1,28 @@
+
+/* The following code applies the GNU Readline library and the GNU GMP library,
+ which are licensed under the GPL version 3.0. Please refer to the file
+ 'LICENSE' in the implementation subdirectory.
+*/
+
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+#include <map>
+#include "types.h"
+#include "apply.h"
+#include "eval.h"
+#include "env.h"
+
+
+TokenVector apply_fn(EnvPtr fn, TokenVector args)
+{
+ if (fn->type() != ENV_PRIMITIVE && fn->type() != ENV_PROCEDURE)
+ {
+ throw new InvalidPrimitiveException();
+ }
+ else
+ {
+ return fn->apply(args);
+ }
+}