sneeker/delta
1
7 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parse scalar expressions with source spans

Browse Source
This commit is contained in:
milner committed 2017-01-10 16:42:00 +00:00
1 parent 582b2c8451
commit a036abb227
9 files changed
+363 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+7 -4
View File
@@ -24,7 +24,7 @@ RT_ML = $(wildcard $(RUNTIME_DIR)/*.ml)
TEST_ML = $(wildcard $(TEST_DIR)/*.ml)
BENCH_ML = $(wildcard $(BENCH_DIR)/*.ml)
LIB_CMX = $(patsubst $(SRC_DIR)/%.ml,$(BUILD)/%.cmx,$(LIB_ML))
LIB_CMX = $(patsubst $(SRC_DIR)/%.ml,$(BUILD)/%.cmx,$(LIB_ML)) $(patsubst %.ml,%.cmx,$(LIB_GEN_ML))
RT_CMX = $(patsubst $(RUNTIME_DIR)/%.ml,$(BUILD)/%.cmx,$(RT_ML))
TEST_CMX = $(patsubst $(TEST_DIR)/%.ml,$(BUILD)/%.cmx,$(TEST_ML))
@@ -91,11 +91,14 @@ $(BUILD)/%.cmi: $(BUILD)/%.mli | $(BUILD)
$(OCAMLC) $(FLAGS) -c $< -o $@
GEN =
LIB_GEN_ML =
ifneq ($(wildcard $(SRC_DIR)/lexer.mll),)
GEN += $(BUILD)/lexer.ml
LIB_GEN_ML += $(BUILD)/lexer.ml
endif
ifneq ($(wildcard $(SRC_DIR)/parser.mly),)
GEN += $(BUILD)/parser.ml $(BUILD)/parser.mli
LIB_GEN_ML += $(BUILD)/parser.ml
endif
$(BUILD)/lexer.ml: $(SRC_DIR)/lexer.mll | $(BUILD)
@@ -110,7 +113,7 @@ DEP_INCLUDES = -I $(SRC_DIR) $(if $(wildcard $(RUNTIME_DIR)),-I $(RUNTIME_DIR),)
INTERFACES = $(wildcard $(SRC_DIR)/*.mli) $(wildcard $(RUNTIME_DIR)/*.mli) $(wildcard $(TEST_DIR)/*.mli)
$(BUILD)/deps.d: $(SRC_ML) $(INTERFACES) $(RT_ML) $(TEST_ML) $(BENCH_ML) $(GEN) | $(BUILD)
$(BUILD)/deps.d: $(MAKEFILE_LIST) $(SRC_ML) $(INTERFACES) $(RT_ML) $(TEST_ML) $(BENCH_ML) $(GEN) | $(BUILD)
$(OCAMLDEP) $(DEP_INCLUDES) $(SRC_ML) $(INTERFACES) $(RT_ML) $(TEST_ML) $(BENCH_ML) $(GEN) > $(BUILD)/deps.tmp
sed -e 's|$(SRC_DIR)/|$(BUILD)/|g' -e 's|$(RUNTIME_DIR)/|$(BUILD)/|g' \
-e 's|$(TEST_DIR)/|$(BUILD)/|g' -e 's|$(BENCH_DIR)/|$(BUILD)/|g' \
@@ -119,8 +122,8 @@ $(BUILD)/deps.d: $(SRC_ML) $(INTERFACES) $(RT_ML) $(TEST_ML) $(BENCH_ML) $(GEN)
-include $(BUILD)/deps.d
$(BUILD)/order.mk: $(SRC_ML) $(RT_ML) $(TEST_ML) | $(BUILD)
{ echo -n "LIB_ORDER = " ; $(OCAMLDEP) -sort $(LIB_ML) | sed -e 's|$(SRC_DIR)/\([^ ]*\)\.ml|$(BUILD)/\1.cmx|g' ; echo ; } > $@
$(BUILD)/order.mk: $(MAKEFILE_LIST) $(SRC_ML) $(RT_ML) $(TEST_ML) $(GEN) | $(BUILD)
{ echo -n "LIB_ORDER = " ; $(OCAMLDEP) -sort $(LIB_ML) $(LIB_GEN_ML) | sed -e 's|$(SRC_DIR)/\([^ ]*\)\.ml|$(BUILD)/\1.cmx|g' -e 's|$(BUILD)/\([^ ]*\)\.ml|$(BUILD)/\1.cmx|g' ; echo ; } > $@
{ echo -n "RT_ORDER = " ; $(OCAMLDEP) -sort $(RT_ML) | sed -e 's|$(RUNTIME_DIR)/\([^ ]*\)\.ml|$(BUILD)/\1.cmx|g' ; echo ; } >> $@
-include $(BUILD)/order.mk