Sync changes to upstream

Author: dsereni

.gitignore

@@ -2,3 +2,4 @@
 _build
 .DS_STORE
 docs/_site/
+bin

CONTRIBUTING.md

@@ -19,12 +19,14 @@ ifeq ($(OS), Linux)
   FSNOTIFY=fsnotify_linux
   ELF=elf
   FRAMEWORKS=
+  SECTCREATE=
 endif
 ifeq ($(OS), Darwin)
   INOTIFY=fsevents
   FSNOTIFY=fsnotify_darwin
   ELF=
   FRAMEWORKS=CoreServices CoreFoundation
+  SECTCREATE=-cclib -sectcreate -cclib __text -cclib flowlib -cclib $(abspath bin/flowlib.tar.gz)
 endif
 
 ################################################################################
@@ -35,6 +37,7 @@ MODULES=\
   src/stubs\
   src/commands\
   src/common\
+  src/embedded\
   src/dts\
   src/typing\
   src/parser\
@@ -60,6 +63,7 @@ MODULES=\
   hack/$(FSNOTIFY)
 
 NATIVE_OBJECT_FILES=\
+  src/embedded/flowlib_elf.o\
   hack/heap/hh_shared.o\
   hack/utils/realpath.o\
   hack/$(INOTIFY)/$(INOTIFY)_stubs.o\
@@ -89,29 +93,36 @@ EXTRA_INCLUDE_OPTS=$(foreach dir, $(EXTRA_INCLUDE_PATHS),-ccopt -I -ccopt $(dir)
 EXTRA_LIB_OPTS=$(foreach dir, $(EXTRA_LIB_PATHS),-cclib -L -cclib $(dir))
 FRAMEWORK_OPTS=$(foreach framework, $(FRAMEWORKS),-cclib -framework -cclib $(framework))
 
-LINKER_FLAGS=$(NATIVE_OBJECT_FILES) $(NATIVE_LIB_OPTS) $(EXTRA_LIB_OPTS) $(FRAMEWORK_OPTS)
+LINKER_FLAGS=$(NATIVE_OBJECT_FILES) $(NATIVE_LIB_OPTS) $(EXTRA_LIB_OPTS) $(FRAMEWORK_OPTS) $(SECTCREATE)
 
-all: build-flow copy-flow-files
+
+all: build-flowlib-archive build-flow copy-flow-files
 
 clean:
 	ocamlbuild -clean
 	rm -rf bin
 	rm -f hack/utils/get_build_id.gen.c
 
-build-flow: build-flow-native-deps
-	ocamlbuild -no-links  $(INCLUDE_OPTS) $(LIB_OPTS) -lflags "$(LINKER_FLAGS)" src/flow.native
+build-flow: build-flow-native-deps build-flowlib-archive
+	ocamlbuild  -no-links  $(INCLUDE_OPTS) $(LIB_OPTS) -lflags "$(LINKER_FLAGS)" src/flow.native
 
 build-flow-native-deps: build-flow-stubs
-	ocamlbuild -cflags "$(EXTRA_INCLUDE_OPTS)" $(NATIVE_OBJECT_FILES)
+	ocamlbuild  -cflags "$(EXTRA_INCLUDE_OPTS)" $(NATIVE_OBJECT_FILES)
 
 build-flow-stubs:
 	echo 'const char* const BuildInfo_kRevision = "${SHA}";' > hack/utils/get_build_id.gen.c
 
+build-flowlib-archive:
+	mkdir -p bin
+	tar czf bin/flowlib.tar.gz lib
+
 copy-flow-files: build-flow $(FILES_TO_COPY)
 	mkdir -p bin
+ifeq ($(OS), Linux)
+	objcopy --add-section flowlib=bin/flowlib.tar.gz _build/src/flow.native bin/flow
+else
 	cp _build/src/flow.native bin/flow
-	mkdir -p bin/lib
-	cp $(FILES_TO_COPY) bin/lib
+endif
 
 test: build-flow copy-flow-files
 	./runtests.sh bin/flow

LICENSE

@@ -1,6 +1,6 @@
 lex_test
 parse_test
 lexer_flow.ml
-flow.js
+flow_parser.js
 perf_test
 pfff_test

Makefile

@@ -1,51 +1,26 @@
-TOP=../../..
+# Copyright (c) 2014, Facebook, Inc.
+# All rights reserved.
 
-SRC = spider_monkey_ast.ml parse_error.ml lexer_flow.ml parser_flow.ml
+all: build-parser
 
-INCLUDEDIRS=
+clean:
+	ocamlbuild -clean
+	rm -f flow_parser.js tools/native_test_files
 
-LIBS= 
+build-parser: 
+	ocamlbuild -no-links parser_flow.cmxa
 
-OCAMLCFLAGS+=-w +a-4-6-29-35-44-48-27 -warn-error +a
+parserjs: 
+	ocamlbuild -use-ocamlfind -pkgs js_of_ocaml flow_parser_js.byte
+	js_of_ocaml -opt 3 -o flow_parser.js flow_parser_js.byte
+	rm flow_parser_js.byte
 
--include $(TOP)/Makefile.common
-
-.PHONY:: tools test
-
-all:: all.opt
-all.opt: parser_flow.cmxa flow.js
-all.bc: parser_flow.cma flow.js
-
-test: all
+test: build-parser parserjs 
 	./test/run_esprima_tests.js
 	./test/run_hardcoded_tests.js
 
-tools: parser_flow.cmxa
-	$(MAKE) -C tools all
-
-lexer_flow.ml: lexer_flow.mll
-	ocamllex $<
-
-parser_flow.cma: $(OBJS) parser_flow.cmo
-	$(OCAMLC) -a -o $@ $^
-
-parser_flow.cmxa: $(OPTOBJS) parser_flow.cmx
-	$(OCAMLOPT) -a -o $@ $^
-
-# This lives in a different directory so that make depend works
-flow_js.cmo: $(OBJS) flow_js.ml
-	ocamlfind ocamlc $(INCLUDES) -package js_of_ocaml -o flow_js.cmo $(SYSLIBS) -c $^
-
-flow.js: $(LIBS) $(OBJS) flow_js.cmo
-	ocamlfind ocamlc -ccopt -O3 $(INCLUDES) -package js_of_ocaml -linkpkg -o flow_js.bc $(SYSLIBS) $^
-	js_of_ocaml -opt 3 -o $@ flow_js.bc
-
-test_files: $(LIBS) $(OPTOBJS) native_test_files.ml
-	ocamlopt $(INCLUDES) -o test/native_test_files $^
-
-clean::
-	rm -f flow.js lexer_flow.ml
-	$(MAKE) -C tools clean
+tools: native_test_files
 
-depend::
-	$(MAKE) -C tools depend
+native_test_files:
+	ocamlbuild tools/native_test_files.native
+	mv native_test_files.native tools/native_test_files

PATENTS

@@ -3,7 +3,7 @@
  */
 
 var esprima = require("/var/www/scripts/third_party/esprima-fb/esprima.js");
-var flow = require("../flow.js");
+var flow = require("../flow_parser.js");
 var util = require("util");
 var ast_types = require("ast-types");
 

gentests.sh

@@ -1,4 +1,4 @@
-var flow = require("./../flow.js");
+var flow = require("./../flow_parser.js");
 var util = require("util");
 var ast_types = require("ast-types");
 

hack/utils/sysConfig.ml

@@ -140,7 +140,7 @@ module Type = struct
   | PredicateT of predicate * t
 
   (* == *)
-  | EqT of t
+  | EqT of reason * t
 
   (* operation on polymorphic types *)
   | SpecializeT of reason * t list * t
@@ -677,14 +677,14 @@ let rec reason_of_t = function
       prefix_reason "optional of " (reason_of_t t)
 
   | RestT t ->
-      prefix_reason "rest of " (reason_of_t t)
+      prefix_reason "rest array of " (reason_of_t t)
 
   | PredicateT (pred,t) -> prefix_reason
       ((string_of_predicate pred) ^ " # ")
       (reason_of_t t)
 
-  | EqT t ->
-      prefix_reason "non-strict (in)equality comparison with " (reason_of_t t)
+  | EqT (reason, t) ->
+      reason
 
   | MarkupT(reason,_,_)
 

src/embedded/.depend

@@ -89,7 +89,7 @@ module Type :
       | ComparatorT of reason * t
 
       | PredicateT of predicate * t
-      | EqT of t
+      | EqT of reason * t
 
       | SpecializeT of reason * t list * t