---

yaml
---
r: 267
b: refs/heads/master
c: b096b0e
h: refs/heads/master
i:
  265: 10756b7
  263: 9745e2a
v: v3

Author: boz

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b675a021a73a3dfa09079790a50302aeb6d1616
+refs/heads/master: b096b0e3084079a8cb525e5590b9ab3e512109ea

trunk/.gitignore

@@ -24,6 +24,7 @@
 *.toc
 *.tp
 *.vr
+*.swp
 .hg/
 .hgignore
 lexer.ml

trunk/AUTHORS.txt

@@ -8,11 +8,8 @@ Andreas Gal <[email protected]>
 Brendan Eich <[email protected]>
 Chris Double <[email protected]>
 Dave Herman <[email protected]>
-Jason Orendorff <[email protected]>
-Jeff Balogh <[email protected]>
 Jeff Mulzelaar <[email protected]>
 Matt Brubeck <[email protected]>
 Michael Bebenita <[email protected]>
 Patrick Walton <[email protected]>
-Ralph Giles <[email protected]>
 Roy Frostig <[email protected]>

trunk/doc/rust.texi

@@ -1201,9 +1201,9 @@ different tasks. Like any other immutable type, they can pass over channels,
 and live as long as the last task referencing them within a given domain. When
 unreferenced, they are destroyed immediately (due to reference-counting) and
 returned to the heap memory allocator. Destruction of an immutable box also
-executes within the context of the task that drops the last reference to a
-shared heap allocation, so executing a long-running destructor does not
-interrupt execution of other tasks.
+executes within the context of task that drops the last reference to a shared
+heap allocation, so executing a long-running destructor does not interrupt
+execution of other tasks.
 
 
 @node       Ref.Mem.Own
@@ -2997,7 +2997,7 @@ by the runtime or emitted to a system console. Log statements are enabled or
 disabled dynamically at run-time on a per-task and per-item
 basis. @xref{Ref.Run.Log}.
 
-Executing a @code{log} statement is not considered an @code{io} effect in the
+Executing a @code{log} statement not considered an @code{io} effect in the
 effect system. In other words, a pure function remains pure even if it
 contains a log statement.
 
@@ -3033,7 +3033,7 @@ fn read_file_lines(&str path) -> vec[str] @{
     note path;
     vec[str] r;
     file f = open_read(path);
-    for each (str &s = lines(f)) @{
+    for* (str &s = lines(f)) @{
         vec.append(r,s);
     @}
     ret r;
@@ -3046,11 +3046,10 @@ completes normally, the runtime will not log the path.
 
 A value that is marked by a @code{note} statement is @emph{not} copied aside
 when control passes through the @code{note}. In other words, if a @code{note}
-statement notes a particular @var{lval}, and code after the @code{note}
-mutates that slot, and then a subsequent failure occurs, the @emph{mutated}
-value will be logged during unwinding, @emph{not} the original value that was
-denoted by the @var{lval} at the moment control passed through the @code{note}
-statement.
+statement notes a particular @var{lval}, and code after the @code{note} that
+slot, and then a subsequent failure occurs, the @emph{mutated} value will be
+logged during unwinding, @emph{not} the original value that was denoted by the
+@var{lval} at the moment control passed through the @code{note} statement.
 
 @node       Ref.Stmt.While
 @subsection Ref.Stmt.While

trunk/src/Makefile

@@ -23,7 +23,11 @@ CFG_GCC_CFLAGS :=
 CFG_GCC_LINK_FLAGS :=
 CFG_VALGRIND :=
 
-CFG_LLVM_CONFIG := llvm-config
+# Issue #102, LLVM-config logic is assuming "presence of llvm-config"
+# means "presence of ocaml bindings". Commenting out for now.
+# CFG_LLVM_CONFIG := llvm-config
+
+CFG_LLVM_CONFIG :=
 CFG_BOOT_FLAGS := $(FLAGS)
 
 ifeq ($(CFG_OSTYPE), Linux)
@@ -133,7 +137,6 @@ ifdef PROFILE
   $(info cfg: building with profiling info (forcing native output))
   CFG_NATIVE := 1
   CFG_OCAMLOPT_PROFILE_FLAGS := -p
-  NO_LLVM := 1
 endif
 
 ifdef DEBUG
@@ -162,10 +165,6 @@ ifneq ($(CFG_LLVM_CONFIG),)
   CFG_LLVM_VERSION := $(shell $(CFG_LLVM_CONFIG) --version)
   ifeq ($(CFG_LLVM_VERSION),2.8svn)
     $(info cfg: using LLVM version 2.8svn)
-    WHERE := $(shell ocamlc -where)
-    ifneq ($(shell test -e $(WHERE)/llvm.cma && echo ok),ok)
-      CFG_LLVM_CONFIG := $(info cfg: LLVM ocaml bindings not found)
-    endif
   else
     CFG_LLVM_CONFIG :=
     $(info cfg: incompatible LLVM version $(CFG_LLVM_VERSION), \
@@ -174,6 +173,7 @@ ifneq ($(CFG_LLVM_CONFIG),)
 endif
 ifdef CFG_LLVM_CONFIG
   VARIANT=llvm
+  WHERE := $(shell ocamlc -where)
   LLVM_LIBS := llvm.cma llvm_bitwriter.cma
   LLVM_NATIVE_LIBS := llvm.cmxa llvm_bitwiter.cmxa
   LLVM_CLIBS := $(shell for c in `$(CFG_LLVM_CONFIG) --ldflags --libs` \
@@ -201,9 +201,8 @@ CFG_BOOT_FLAGS += -L .
 # Boot targets and rules
 ######################################################################
 
-ML_DEP_INCS := -I boot/fe -I boot/me -I boot/be -I boot/driver/$(VARIANT) \
-  -I boot/driver -I boot/util
-ML_INCS := $(ML_DEP_INCS) $(LLVM_INCS)
+ML_INCS := -I boot/fe -I boot/me -I boot/be -I boot/driver/$(VARIANT) \
+  -I boot/driver -I boot/util $(LLVM_INCS)
 ML_LIBS := unix.cma nums.cma bigarray.cma
 ML_NATIVE_LIBS := unix.cmxa nums.cmxa bigarray.cmxa
 OCAMLC_FLAGS := -g $(ML_INCS) -w Ael -warn-error Ael
@@ -414,7 +413,6 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
                       item-name-overload.rs \
                       large-records.rs \
                       lazy-and-or.rs \
-                      lazy-init.rs \
                       lazychan.rs \
                       linear-for-loop.rs \
                       list.rs \
@@ -466,7 +464,6 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
                       vec-append.rs \
                       vec-concat.rs \
                       vec-drop.rs \
-                      vec-late-init.rs \
                       vec-slice.rs \
                       vec.rs \
                       writealias.rs \
@@ -684,11 +681,11 @@ C_DEPFILES := $(RUNTIME_CS:%.cpp=%.d)
 
 %.d: %.ml $(MKFILES)
 	@$(call CFG_ECHO, dep: $<)
-	$(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >$@
+	$(CFG_QUIET)ocamldep$(OPT) $(ML_INCS) $< $(CFG_PATH_MUNGE) >$@
 
 %.d: %.mli $(MKFILES)
 	@$(call CFG_ECHO, dep: $<)
-	$(CFG_QUIET)ocamldep$(OPT) $(ML_DEP_INCS) $< $(CFG_PATH_MUNGE) >$@
+	$(CFG_QUIET)ocamldep$(OPT) $(ML_INCS) $< $(CFG_PATH_MUNGE) >$@
 
 ifneq ($(MAKECMDGOALS),clean)
 -include $(ML_DEPFILES) $(C_DEPFILES)
@@ -731,7 +728,7 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
                 rt/uthash/uthash.h rt/uthash/utlist.h \
                 rt/bigint/bigint.h rt/bigint/bigint_int.cpp \
                 rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h
-PKG_FILES := README boot/README \
+PKG_FILES := README \
              $(wildcard etc/*.*) \
              $(MKFILES) $(BOOT_MLS) boot/fe/lexer.mll \
              $(COMPILER_INPUTS) \

trunk/src/README

@@ -3,7 +3,6 @@ This is preliminary version of the Rust compiler.
 Source layout:
 
 boot/              The bootstrap compiler
-boot/README        - More-detailed guide to it.
 boot/fe            - Front end (lexer, parser, AST)
 boot/me            - Middle end (resolve, check, layout, trans)
 boot/be            - Back end (IL, RA, insns, asm, objfiles)