Skip to content

Commit

Permalink
Merge pull request #159 from MPLLang/prep-v0.3-release
Browse files Browse the repository at this point in the history
Enable entanglement detection by default (prepping for v0.3 release)
  • Loading branch information
shwestrick authored Jun 25, 2022
2 parents 6c13f5c + 61cbcd3 commit 7f59464
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MPL=../build/bin/mpl
FLAGS=-default-type int64 -default-type word64
DBG_FLAGS=-debug true -debug-runtime true -keep g
TRACE_FLAGS=-trace true -trace-runtime true
DETECT_FLAGS=-detect-entanglement true
NODETECT_FLAGS=-detect-entanglement false

PROGRAMS= \
fib \
Expand All @@ -21,14 +21,14 @@ PROGRAMS= \

TRACE_PROGRAMS := $(addsuffix .trace,$(PROGRAMS))
DBG_PROGRAMS := $(addsuffix .dbg,$(PROGRAMS))
DETECT_PROGRAMS := $(addsuffix .detect,$(PROGRAMS))
NODETECT_PROGRAMS := $(addsuffix .nodetect,$(PROGRAMS))
SYSMPL_PROGRAMS := $(addsuffix .sysmpl,$(PROGRAMS))

all: $(PROGRAMS)

all-dbg: $(DBG_PROGRAMS)

all-detect: $(DETECT_PROGRAMS)
all-nodetect: $(DETECT_PROGRAMS)

all-sysmpl: $(SYSMPL_PROGRAMS)

Expand All @@ -47,10 +47,10 @@ $(TRACE_PROGRAMS): %.trace: phony
$(MPL) $(FLAGS) $(TRACE_FLAGS) -output bin/$*.trace src/$*/sources.mlb
@echo "successfully built bin/$*.trace"

$(DETECT_PROGRAMS): %.detect: phony
$(NODETECT_PROGRAMS): %.nodetect: phony
@mkdir -p bin
$(MPL) $(FLAGS) $(DETECT_FLAGS) -output bin/$*.detect src/$*/sources.mlb
@echo "successfully built bin/$*.detect"
$(MPL) $(FLAGS) $(NODETECT_FLAGS) -output bin/$*.nodetect src/$*/sources.mlb
@echo "successfully built bin/$*.nodetect"

$(SYSMPL_PROGRAMS): %.sysmpl: phony
@mkdir -p bin
Expand Down
4 changes: 2 additions & 2 deletions mlton/control/control-flags.sml
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@ val defaultWord = control {name = "defaultWord",

val detectEntanglement =
control {name = "detect-entanglement",
default = false,
default = true,
toString = Bool.toString}

val detectEntanglementRuntime =
control {name = "detect-entanglement-runtime",
default = false,
default = true,
toString = Bool.toString}

val diagPasses =
Expand Down

0 comments on commit 7f59464

Please sign in to comment.