Server dev

Makefile

@@ -14,7 +14,6 @@ PHASEA           = build/phaseA
 PHASEB           = build/phaseB
 PHASEC           = build/phaseC
 RELEASE_DIR      = build/release
-BUNDLED_DEPS     = build/bundled-node-deps.js
 # HACK HACK HACK (See https://github.com/npm/npm/issues/3738)
 export PATH      := ./node_modules/.bin:../node_modules/.bin:../../node_modules/.bin:$(PATH)
 SHELL := /bin/bash
@@ -23,7 +22,8 @@ SHELL := /bin/bash
 PARSERS         := $(patsubst src/js/base/%-grammar.bnf,src/js/%-parser.js,$(wildcard src/$(JSBASE)/*-grammar.bnf))
 COPY_JS          = $(patsubst src/js/base/%.js,src/js/%.js,$(wildcard src/$(JSBASE)/*.js)) \
 	src/js/js-numbers.js
-COMPILER_FILES = $(wildcard src/arr/compiler/*.arr) $(wildcard src/arr/compiler/locators/*.arr) $(wildcard src/js/trove/*.js) $(wildcard src/arr/trove/*.arr)
+COPY_LIB         = $(wildcard lib/jglr/*.js)
+COMPILER_FILES = $(wildcard src/arr/compiler/*.js) $(wildcard src/arr/compiler/*.arr) $(wildcard src/arr/compiler/locators/*.arr) $(wildcard src/js/trove/*.js) $(wildcard src/arr/trove/*.arr)
 TROVE_ARR_FILES = $(wildcard src/arr/trove/*.arr)
 
 # You can download the script to work with s3 here:
@@ -49,15 +49,14 @@ TROVE_ARR_FILES = $(wildcard src/arr/trove/*.arr)
 # below.
 S3               = s3
 
-PHASEA_ALL_DEPS := $(patsubst src/%,$(PHASEA)/%,$(COPY_JS))
-PHASEB_ALL_DEPS := $(patsubst src/%,$(PHASEB)/%,$(COPY_JS))
-PHASEC_ALL_DEPS := $(patsubst src/%,$(PHASEC)/%,$(COPY_JS))
+PHASEA_ALL_DEPS := $(patsubst src/%,$(PHASEA)/%,$(COPY_JS)) $(patsubst lib/jglr/%.js,$(PHASEA)/js/%.js,$(COPY_LIB)) $(PHASEA)/bundled-node-compile-deps.js $(PHASEA)/bundled-node-deps.js $(PHASEA)/config.json
+PHASEB_ALL_DEPS := $(patsubst src/%,$(PHASEB)/%,$(COPY_JS)) $(patsubst lib/jglr/%.js,$(PHASEB)/js/%.js,$(COPY_LIB)) $(PHASEB)/bundled-node-compile-deps.js $(PHASEB)/bundled-node-deps.js $(PHASEB)/config.json
+PHASEC_ALL_DEPS := $(patsubst src/%,$(PHASEC)/%,$(COPY_JS)) $(patsubst lib/jglr/%.js,$(PHASEC)/js/%.js,$(COPY_LIB)) $(PHASEC)/bundled-node-compile-deps.js $(PHASEC)/bundled-node-deps.js $(PHASEC)/config.json
 
 PHASEA_DIRS     := $(sort $(dir $(PHASEA_ALL_DEPS)))
 PHASEB_DIRS     := $(sort $(dir $(PHASEB_ALL_DEPS)))
 PHASEC_DIRS     := $(sort $(dir $(PHASEC_ALL_DEPS)))
 
-
 # NOTE: Needs TWO blank lines here, dunno why
 define \n
 
@@ -88,15 +87,29 @@ phaseA: $(PHASEA)/pyret.jarr
 phaseA-deps: $(PYRET_COMPA) $(PHASEA_ALL_DEPS) $(COMPILER_FILES) $(patsubst src/%,$(PHASEA)/%,$(PARSERS))
 
 
-$(PHASEA)/pyret.jarr: $(PYRET_COMPA) $(PHASEA_ALL_DEPS) $(COMPILER_FILES) $(patsubst src/%,$(PHASEA)/%,$(PARSERS)) $(BUNDLED_DEPS)
+$(PHASEA)/pyret.jarr: $(PYRET_COMPA) $(PHASEA_ALL_DEPS) $(COMPILER_FILES) $(patsubst src/%,$(PHASEA)/%,$(PARSERS))
 	$(NODE) $(PYRET_COMP0) --outfile build/phaseA/pyret.jarr \
                       --build-runnable src/arr/compiler/pyret.arr \
                       --builtin-js-dir src/js/trove/ \
                       --builtin-arr-dir src/arr/trove/ \
                       --compiled-dir build/phaseA/compiled/ \
+                      --deps-file build/phaseA/bundled-node-compile-deps.js \
                       -no-check-mode $(EF) \
                       --require-config src/scripts/standalone-configA.json
 
+$(PHASEA)/libs.jarr: $(PHASEA)/pyret.jarr
+	$(NODE) $(PHASEA)/pyret.jarr --outfile build/phaseA/base.jarr \
+                      --build-runnable src/arr/compiler/libs.arr \
+                      --builtin-js-dir src/js/trove/ \
+                      --builtin-arr-dir src/arr/trove/ \
+                      --compiled-dir build/phaseA/lib-compiled/ \
+                      --deps-file build/phaseA/bundled-node-compile-deps.js \
+                      -no-check-mode $(EF) \
+                      --require-config src/scripts/standalone-configA.json
+
+.PHONY : libA
+libA : $(PHASEA)/libs.jarr
+
 .PHONY : phaseB
 phaseB: $(PHASEB)/pyret.jarr
 
@@ -106,8 +119,9 @@ $(PHASEB)/pyret.jarr: $(PHASEA)/pyret.jarr $(PHASEB_ALL_DEPS) $(patsubst src/%,$
                       --builtin-js-dir src/js/trove/ \
                       --builtin-arr-dir src/arr/trove/ \
                       --compiled-dir build/phaseB/compiled/ \
+                      --deps-file build/phaseB/bundled-node-compile-deps.js \
                       -no-check-mode $(EF) \
-                      --require-config src/scripts/standalone-configB.json
+                      --require-config build/phaseB/config.json
 
 
 .PHONY : phaseC
@@ -119,12 +133,29 @@ $(PHASEC)/pyret.jarr: $(PHASEB)/pyret.jarr $(PHASEC_ALL_DEPS) $(patsubst src/%,$
                       --builtin-js-dir src/js/trove/ \
                       --builtin-arr-dir src/arr/trove/ \
                       --compiled-dir build/phaseC/compiled/ \
+                      --deps-file build/phaseB/bundled-node-compile-deps.js \
                       -no-check-mode $(EF) \
-                      --require-config src/scripts/standalone-configC.json
+                      --require-config build/phaseB/config.json
 
 .PHONY : show-comp
 show-comp: build/show-compilation.jarr
 
+$(PHASEA)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
+	browserify src/js/trove/require-node-compile-dependencies.js -o $@
+$(PHASEA)/bundled-node-deps.js: src/js/trove/require-node-dependencies.js
+	browserify src/js/trove/require-node-dependencies.js -o $@
+$(PHASEB)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
+	browserify src/js/trove/require-node-compile-dependencies.js -o $@
+$(PHASEC)/bundled-node-compile-deps.js: src/js/trove/require-node-compile-dependencies.js
+	browserify src/js/trove/require-node-compile-dependencies.js -o $@
+
+$(PHASEA)/config.json: src/scripts/node_modules-config.json
+	cp $< $@
+$(PHASEB)/config.json: src/scripts/node_modules-config.json
+	cp $< $@
+$(PHASEC)/config.json: src/scripts/node_modules-config.json
+	cp $< $@
+
 showpath:
 	@echo my new PATH = $(PATH)
 	@echo `which browserify`
@@ -194,10 +225,16 @@ $(PHASEC)/$(JS)/%-parser.js: src/$(JSBASE)/%-grammar.bnf src/$(JSBASE)/%-tokeniz
 
 $(PHASEA)/$(JS)/%.js : src/$(JSBASE)/%.js
 	cp $< $@
+$(PHASEA)/$(JS)/%.js : lib/jglr/%.js
+	cp $< $@
 $(PHASEB)/$(JS)/%.js : src/$(JSBASE)/%.js
 	cp $< $@
+$(PHASEB)/$(JS)/%.js : lib/jglr/%.js
+	cp $< $@
 $(PHASEC)/$(JS)/%.js : src/$(JSBASE)/%.js
 	cp $< $@
+$(PHASEC)/$(JS)/%.js : lib/jglr/%.js
+	cp $< $@
 
 .PHONY : install
 install:
@@ -304,34 +341,4 @@ new-bootstrap: no-diff-standalone $(PHASE0BUILD)
 no-diff-standalone: phaseB phaseC
 	diff $(PHASEB)/pyret.jarr $(PHASEC)/pyret.jarr
 
-$(RELEASE_DIR)/phase1:
-	$(call MKDIR,$(RELEASE_DIR)/phase1)
-
-ifdef VERSION
-release-gzip: $(PYRET_COMP) phase1 standalone1 $(RELEASE_DIR)/phase1
-	gzip -c $(PHASE1)/pyret.js > $(RELEASE_DIR)/pyret.js
-	(cd $(PHASE1) && find * -type d -print0) | parallel --gnu -0 mkdir -p '$(RELEASE_DIR)/phase1/{}'
-	(cd $(PHASE1) && find * -type f -print0) | parallel --gnu -0 "gzip -c '$(PHASE1)/{}' > '$(RELEASE_DIR)/phase1/{}'"
-horizon-gzip: standalone1 $(RELEASE_DIR)/phase1
-	sed "s/define('pyret-start/define('pyret/" $(PHASE1)/pyret.js > $(RELEASE_DIR)/pyret-full.js
-	gzip -c $(RELEASE_DIR)/pyret-full.js > $(RELEASE_DIR)/pyret.js
-	(cd $(PHASE1) && find * -type d -print0) | parallel --gnu -0 mkdir -p '$(RELEASE_DIR)/phase1/{}'
-	(cd $(PHASE1) && find * -type f -print0) | parallel --gnu -0 "gzip -c '$(PHASE1)/{}' > '$(RELEASE_DIR)/phase1/{}'"
-# If you need information on using the s3 script, run `s3 --man'
-horizon-release: horizon-gzip
-	cd $(RELEASE_DIR) && \
-	find * -type f -print0 | parallel --gnu -0 $(S3) add --header 'Content-Type:text/javascript' --header 'Content-Encoding:gzip' --acl 'public-read' ':pyret-horizon/current/{}' '{}'
-release: release-gzip
-	cd $(RELEASE_DIR) && \
-	find * -type f -print0 | parallel --gnu -0 $(S3) add --header 'Content-Type:text/javascript' --header 'Content-Encoding:gzip' --acl 'public-read' ':pyret-releases/$(VERSION)/{}' '{}'
-test-release: release-gzip
-	cd $(RELEASE_DIR) && \
-	find * -type f -print0 | parallel --gnu -0 $(S3) add --header 'Content-Type:text/javascript' --header 'Content-Encoding:gzip' --acl 'public-read' ':pyret-releases/$(VERSION)-test/{}' '{}'
-else
-release-gzip:
-	$(error Cannot release from this platform)
-release:
-	$(error Cannot release from this platform)
-test-release: release-gzip
-	$(error Cannot release from this platform)
-endif
+

build/phase0/trove/global.js

@@ -64,12 +64,55 @@
       "equal-always": "AnyPred2",
       "equal-now": "AnyPred2",
       "identical": "AnyPred2",
-      "within": ["arrow", ["Number"], "AnyPred2"],
-      "within-abs": ["arrow", ["Number"], "AnyPred2"],
-      "within-rel": ["arrow", ["Number"], "AnyPred2"],
-      "within-now": ["arrow", ["Number"], "AnyPred2"],
-      "within-abs-now": ["arrow", ["Number"], "AnyPred2"],
-      "within-rel-now": ["arrow", ["Number"], "AnyPred2"],
+      "within": {'bind': 'fun',
+           'flatness': 0,
+           'name': 'within',
+           'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-abs": {'bind': 'fun',
+                 'flatness': 0,
+                 'name': 'within-abs',
+                     'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-rel": {'bind': 'fun',
+                     'flatness': 0,
+                     'name': 'within-rel',
+                     'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-now": {'bind': 'fun',
+                     'flatness': 0,
+                     'name': 'within-now',
+                     'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-abs-now": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-abs-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-rel-now": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-abs3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-rel3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-now3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-abs-now3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+      "within-rel-now3": {'bind': 'fun',
+                         'flatness': 0,
+                         'name': 'within-rel-now',
+                         'typ':["arrow", ["Number"], "AnyPred2"]},
+
 
       // Number functions
 

npm-readme.md

@@ -0,0 +1,99 @@
+```
+Pyret Command-line Interface
+
+  The pyret command compiles and runs Pyret programs. It helps manage a compile
+  server that runs in the background to speed up compilation jobs, and manages
+  state in a project's working directory to cache compiled files.
+
+Basic Usage
+
+  $ cat ahoy-world.arr
+  check: "Ahoy " + "world!" is "Ahoy world!" end
+  $ pyret ahoy-world.arr
+  Starting Parley server...
+  1/1 modules compiled
+  Looks shipshape, your test passed, mate!
+
+
+  This command compiled and ran ahoy-world.arr. The first time, this will take
+  a few seconds as a server starts up in the background, in order to make
+  future compiles fast.
+
+
+  It's worth noting that the file is compiled into a standalone JavaScript file
+  with the .jarr extension:
+
+  $ node ahoy-world.jarr
+  Looks shipshape, your test passed, mate!
+
+
+  Most uses (e.g. for homework) only need to use the pyret command directly on
+  .arr files, but there are several other options that can be provided.
+
+Options
+
+  -h, --help                  Show this help message.
+  -p, --program <file>.arr    This is the default option, so using the flag is optional. Specifies the path
+                              to the program to compile (usually a .arr file). Will start a server if one
+                              isn't running, and will report an error if there is no .pyret in this
+                              directory or in any parent of this directory. Generates a standalone compiled
+                              file based on --outfile, and immediately executes it. The exit code is non-
+                              zero if the file fails to compile, and is the exit code of the executed
+                              program if it compiles successfully.
+  -o, --outfile <file>.jarr   Specify the file to put the standalone compiled output into. The program can
+                              be re-run without re-compiling by using the node command. Defaults to the
+                              name of the --program with .arr replaced with .jarr.
+  -q, --quiet                 Don't show the progress indicator output like "1/4 modules compiled"
+  -k, --no-check-mode         Omit check blocks during compilation, and generate a standalone program that
+                              doesn't print testing information at all.
+  -n, --clean                 Removes all compiled code in the .pyret directory. This can be necessary when
+                              Pyret updates to clear out stale compiled files.
+  -s, --shutdown              Shuts down the currently-running compile server (if any is running), by
+                              sending it a message over the specified or default --port
+  -t, --port string           Specify the path to a socket file to use to communicate with the server.
+                              Defaults to /tmp/parley-<username>/comm.sock.
+
+The .pyret/ Directory
+
+  The first time you run the pyret command in a directory, it creates a .pyret/
+  directory there.
+
+  This directory is used to store the compiled versions of individual .arr
+  files in your project. They will appear in .pyret/compiled.
+
+  Each directory in which you run pyret will have this sub-directory created.
+  In general, you should never need to look in or modify the directory. If you
+  want to look at the innards of Pyret, you can check out these files.
+
+The Compile Server
+
+  The compiler will not run without a running server. The pyret command
+  tries to connect to a compile server on the specified port on
+  startup, and if it cannot, starts one before continuing. The server
+  accepts requests to start and stop compile jobs, and to shut down, and
+  sends messages indicating compile status and when the job is complete.
+
+  The default mode of operation is to have a single compile server running
+  per user (hence the default naming of the --port). This makes it
+  simple to change directories to different projects and get the benefits
+  of the server's quick responses. If multiple compile jobs are sent at the
+  same time, they are queued and processed in FIFO order.
+
+  This server is experimental, and likely can get stuck running, or lose
+  track of its connection, so it's worth specifying what resources it uses
+  so they can be cleaned up. The server that's started in the background
+  does the work of creating the specified socket file, and its process
+  should clean up that file when it's done or when --shutdown is
+  used. You can also manually remove it (check
+  /tmp/parley-<username>/) if something gets wedged. This is
+  the only bit of state that the client and server use to communicate. The
+  server runs a file called pyret.jarr, so if you want to
+  check on potential runaway server processes this command can find them:
+
+  $ ps aux | grep pyret.jarr
+
+Support and Contact
+
+  This interface is experimental. Feedback and issue reports at
+  https://github.com/brownplt/pyret-lang/issues/new are most appreciated.
+```