Merge branch 'master' into recursive-elseif

Conflicts:

	src/Makefile
	src/comp/front/ast.rs
	src/comp/front/parser.rs
	src/comp/middle/fold.rs
	src/comp/middle/trans.rs

Author: brson

AUTHORS.txt

@@ -15,6 +15,7 @@ Jason Orendorff <[email protected]>
 Jeff Balogh <[email protected]>
 Jeff Mulzelaar <[email protected]>
 Jeffrey Yasskin <[email protected]>
+Marijn Haverbeke <[email protected]>
 Matt Brubeck <[email protected]>
 Michael Bebenita <[email protected]>
 Or Brostovski <[email protected]>

doc/rust.texi

@@ -592,10 +592,12 @@ or interrupted by ignored characters.
 
 Most tokens in Rust follow rules similar to the C family.
 
-Most tokens (including identifiers, whitespace, keywords, operators and
-structural symbols) are drawn from the ASCII-compatible range of
-Unicode. String and character literals, however, may include the full range of
-Unicode characters.
+Most tokens (including whitespace, keywords, operators and structural symbols)
+are drawn from the ASCII-compatible range of Unicode. Identifiers are drawn
+from Unicode characters specified by the @code{XID_start} and
+@code{XID_continue} rules given by UAX #31@footnote{Unicode Standard Annex
+#31: Unicode Identifier and Pattern Syntax}. String and character literals may
+include the full range of Unicode characters.
 
 @emph{TODO: formalize this section much more}.
 
@@ -638,18 +640,22 @@ token or a syntactic extension token.  Multi-line comments may be nested.
 @c * Ref.Lex.Ident::             Identifier tokens.
 @cindex Identifier token
 
-Identifiers follow the pattern of C identifiers: they begin with a
-@emph{letter} or @emph{underscore}, and continue with any combination of
-@emph{letters}, @emph{decimal digits} and underscores, and must not be equal
-to any keyword or reserved token. @xref{Ref.Lex.Key}. @xref{Ref.Lex.Res}.
+Identifiers follow the rules given by Unicode Standard Annex #31, in the form
+closed under NFKC normalization, @emph{excluding} those tokens that are
+otherwise defined as keywords or reserved
+tokens. @xref{Ref.Lex.Key}. @xref{Ref.Lex.Res}.
 
-A @emph{letter} is a Unicode character in the ranges U+0061-U+007A and
-U+0041-U+005A (@code{'a'}-@code{'z'} and @code{'A'}-@code{'Z'}).
+That is: an identifier starts with any character having derived property
+@code{XID_Start} and continues with zero or more characters having derived
+property @code{XID_Continue}; and such an identifier is NFKC-normalized during
+lexing, such that all subsequent comparison of identifiers is performed on the
+NFKC-normalized forms.
 
-An @dfn{underscore} is the character U+005F ('_').
+@emph{TODO: define relationship between Unicode and Rust versions}.
 
-A @dfn{decimal digit} is a character in the range U+0030-U+0039
-(@code{'0'}-@code{'9'}).
+@footnote{This identifier syntax is a superset of the identifier syntaxes of C
+and Java, and is modeled on Python PEP #3131, which formed the definition of
+identifiers in Python 3.0 and later.}
 
 @node       Ref.Lex.Key
 @subsection Ref.Lex.Key
@@ -1984,22 +1990,22 @@ module system).
 An example of a @code{tag} item and its use:
 @example
 tag animal @{
-  dog();
-  cat();
+  dog;
+  cat;
 @}
 
-let animal a = dog();
-a = cat();
+let animal a = dog;
+a = cat;
 @end example
 
 An example of a @emph{recursive} @code{tag} item and its use:
 @example
 tag list[T] @{
-  nil();
+  nil;
   cons(T, @@list[T]);
 @}
 
-let list[int] a = cons(7, cons(13, nil()));
+let list[int] a = cons(7, cons(13, nil));
 @end example
 
 
@@ -3395,9 +3401,9 @@ control enters the block.
 An example of a pattern @code{alt} statement:
 
 @example
-type list[X] = tag(nil(), cons(X, @@list[X]));
+type list[X] = tag(nil, cons(X, @@list[X]));
 
-let list[int] x = cons(10, cons(11, nil()));
+let list[int] x = cons(10, cons(11, nil));
 
 alt (x) @{
     case (cons(a, cons(b, _))) @{

src/Makefile

@@ -32,6 +32,19 @@ CFG_RUSTC_FLAGS := -nowarn
 # embedded into the executable, so use a no-op command.
 DSYMUTIL := true
 
+ifeq ($(CFG_OSTYPE), FreeBSD)
+  CFG_RUNTIME := librustrt.so
+  CFG_STDLIB := libstd.so
+  CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include
+  CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt
+  ifeq ($(CFG_CPUTYPE), x86_64)
+    CFG_GCC_CFLAGS += -m32
+    CFG_GCC_LINK_FLAGS += -m32
+  endif
+  CFG_NATIVE := 1
+  CFG_UNIXY := 1
+endif
+
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_RUNTIME := librustrt.so
   CFG_STDLIB := libstd.so
@@ -43,13 +56,6 @@ ifeq ($(CFG_OSTYPE), Linux)
   endif
   CFG_NATIVE := 1
   CFG_UNIXY := 1
-  CFG_VALGRIND := $(shell which valgrind)
-  ifdef CFG_VALGRIND
-    CFG_VALGRIND += --leak-check=full \
-                    --error-exitcode=1 \
-                    --quiet --vex-iropt-level=0 \
-                    --suppressions=etc/x86.supp
-  endif
 endif
 
 ifeq ($(CFG_OSTYPE), Darwin)
@@ -117,6 +123,13 @@ ifdef CFG_UNIXY
       CFG_GCC_LINK_FLAGS += -m32
     endif
   endif
+  CFG_VALGRIND := $(shell which valgrind)
+  ifdef CFG_VALGRIND
+    CFG_VALGRIND += --leak-check=full \
+                    --error-exitcode=1 \
+                    --quiet --vex-iropt-level=0 \
+                    --suppressions=etc/x86.supp
+  endif
 endif
 
 ifdef CFG_GCC
@@ -388,14 +401,15 @@ TASK_XFAILS := test/run-pass/task-comm-8.rs \
 TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     $(NOMINAL_TAG_XFAILS) \
                     $(CONST_TAG_XFAILS) \
+                    test/run-pass/arith-unsigned.rs \
                     test/run-pass/child-outlives-parent.rs \
                     test/run-pass/clone-with-exterior.rs \
                     test/run-pass/constrained-type.rs \
                     test/run-pass/destructor-ordering.rs \
                     test/run-pass/obj-as.rs \
                     test/run-pass/vec-slice.rs \
                     test/run-pass/fn-lval.rs \
-                    test/run-pass/generic-recursive-tag.rs \
+                    test/run-pass/generic-fn-box.rs \
                     test/run-pass/generic-tup.rs \
                     test/run-pass/iter-ret.rs \
                     test/run-pass/lib-io.rs \
@@ -414,101 +428,104 @@ TEST_XFAILS_BOOT :=  $(TASK_XFAILS) \
                     test/compile-fail/bad-recv.rs \
                     test/compile-fail/bad-send.rs \
                     test/compile-fail/infinite-vec-type-recursion.rs \
+                    test/compile-fail/tail-non-call.rs \
                     test/compile-fail/writing-through-read-alias.rs
 
-# Same strategy here for the time being: just list the ones that
-# work and assume the others don't. Invert this when we're closer
-# to actually bootstrapping.
-
-TEST_XFAILS_RUSTC := $(filter-out \
-                      $(addprefix test/run-pass/, \
-                        alt-path.rs \
-                        alt-pattern-simple.rs \
-                        alt-tag.rs \
-                        arith-0.rs \
-                        arith-1.rs \
-                        arith-2.rs \
-                        autoderef-full-lval.rs \
-                        bind-exterior.rs \
-                        bind-interior.rs \
-                        bind-thunk.rs \
-                        bind-trivial.rs \
-                        bitwise.rs \
-                        bool-not.rs \
-                        box.rs \
-                        box-in-tup.rs \
-                        cast.rs \
-                        char.rs \
-                        complex.rs \
-                        const.rs \
-                        dead-code-one-arm-if.rs \
-                        deep.rs \
-                        deref.rs \
-                        div-mod.rs \
-                        drop-bind-thunk-args.rs \
-                        drop-on-ret.rs \
-                        else-if.rs \
-                        fact.rs \
-                        fn-lval.rs \
-                        fun-call-variants.rs \
-                        fun-indirect-call.rs \
-                        generic-fn.rs \
-                        generic-fn-infer.rs \
-                        generic-drop-glue.rs \
-                        generic-tup.rs \
-                        generic-type.rs \
-                        hello.rs \
-                        int.rs \
-                        i32-sub.rs \
-                        i8-incr.rs \
-                        import2.rs \
-                        import3.rs \
-                        import4.rs \
-                        import5.rs \
-                        import6.rs \
-                        import7.rs \
-                        import8.rs \
-                        item-name-overload.rs \
-                        large-records.rs \
-                        lazy-init.rs \
-                        lazy-and-or.rs \
-                        leak-box-as-tydesc.rs \
-                        linear-for-loop.rs \
-                        multiline-comment.rs \
-                        mutual-recursion-group.rs \
-                        obj-drop.rs \
-                        obj-recursion.rs \
-                        obj-with-vec.rs \
-                        operator-associativity.rs \
-                        opeq.rs \
-                        output-slot-variants.rs \
-                        over-constrained-vregs.rs \
-                        readalias.rs \
-                        rec.rs \
-                        rec-auto.rs \
-                        rec-tup.rs \
-                        return-nil.rs \
-                        simple-obj.rs \
-                        stateful-obj.rs \
-                        str-idx.rs \
-                        type-in-nested-module.rs \
-                        type-param.rs \
-                        tup.rs \
-                        u32-decr.rs \
-                        u8-incr.rs \
-                        u8-incr-decr.rs \
-                        uint.rs \
-                        unit.rs \
-                        use.rs \
-                        tag.rs \
-                        vec.rs \
-                        vec-drop.rs \
-                        vec-in-tup.rs \
-                        vec-late-init.rs \
-                        while-and-do-while.rs \
-                        while-flow-graph.rs \
-                        writealias.rs \
+TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
+                        acyclic-unwind.rs \
+                        alt-pattern-drop.rs \
+                        alt-type-simple.rs \
+                        append-units.rs \
+                        basic-1.rs \
+                        basic-2.rs \
+                        basic.rs \
+                        bind-obj-ctor.rs \
+                        child-outlives-parent.rs \
+                        clone-with-exterior.rs \
+                        comm.rs \
+                        constrained-type.rs \
+                        destructor-ordering.rs \
+                        drop-parametric-closure-with-bound-box.rs \
+                        export-non-interference.rs \
+                        foreach-nested-2.rs \
+                        foreach-nested.rs \
+                        foreach-put-structured.rs \
+                        foreach-simple-outer-slot.rs \
+                        generic-fn-twice.rs \
+                        generic-iter-frame.rs \
+                        generic-recursive-tag.rs \
+                        generic-tag-alt.rs \
+                        generic-tag-values.rs \
+                        iter-range.rs \
+                        iter-ret.rs \
+                        lazychan.rs \
+                        lib-bitv.rs \
+                        lib-deque.rs \
+                        lib-int.rs \
+                        lib-io.rs \
+                        lib-map.rs \
+                        lib-rand.rs \
+                        lib-sha1.rs \
+                        lib-sort.rs \
+                        lib-str.rs \
+                        lib-task.rs \
+                        lib-uint.rs \
+                        lib-vec-str-conversions.rs \
+                        lib-vec.rs \
+                        many.rs \
+                        mlist-cycle.rs \
+                        mlist.rs \
+                        mutable-alias-vec.rs \
+                        obj-as.rs \
+                        obj-dtor.rs \
+                        obj-return-polytypes.rs \
+                        pred.rs \
+                        preempt.rs \
+                        rt-circular-buffer.rs \
+                        size-and-align.rs \
+                        spawn-fn.rs \
+                        spawn-module-qualified.rs \
+                        spawn.rs \
+                        str-append.rs \
+                        syntax-extension-fmt.rs \
+                        syntax-extension-shell.rs \
+                        task-comm-0.rs \
+                        task-comm-1.rs \
+                        task-comm-10.rs \
+                        task-comm-11.rs \
+                        task-comm-12.rs \
+                        task-comm-13-thread.rs \
+                        task-comm-13.rs \
+                        task-comm-15.rs \
+                        task-comm-2.rs \
+                        task-comm-3.rs \
+                        task-comm-4.rs \
+                        task-comm-5.rs \
+                        task-comm-6.rs \
+                        task-comm-7.rs \
+                        task-comm-8.rs \
+                        task-comm-9.rs \
+                        task-comm.rs \
+                        task-killjoin.rs \
+                        task-life-0.rs \
+                        threads.rs \
+                        type-sizes.rs \
+                        typestate-cfg-nesting.rs \
+                        use-import-export.rs \
+                        user.rs \
+                        utf8.rs \
+                        vec-alloc-append.rs \
+                        vec-append.rs \
+                        vec-slice.rs \
+                        while-prelude-drop.rs \
+                        while-with-break.rs \
+                        yield.rs \
+                        yield2.rs \
+                        multi.rc \
+                        native-mod.rc \
+                        native.rc \
                         ) \
+                     $(filter-out \
                       $(addprefix test/compile-fail/, \
                         alt-tag-nullary.rs \
                         alt-tag-unary.rs \
@@ -517,6 +534,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         bad-expr-path.rs \
                         bad-expr-path2.rs \
                         bogus-tag.rs \
+                        fru-extra-field.rs \
                         import.rs \
                         import2.rs \
                         import3.rs \
@@ -526,11 +544,20 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         multiline-comment-line-tracking.rs \
                         output-type-mismatch.rs \
                         rec-missing-fields.rs \
+                        reserved-dec.rs \
+                        reserved-f128.rs \
+                        reserved-f16.rs \
+                        reserved-f80.rs \
+                        reserved-m128.rs \
+                        reserved-m32.rs \
+                        reserved-m64.rs \
+                        tail-non-call.rs \
+                        tail-typeck.rs \
                         type-shadow.rs \
                         while-type-error.rs \
                         wrong-ret-type.rs \
                         ), \
-                      $(wildcard test/*/*.rs test/*/*.rc))
+                      $(wildcard test/*fail/*.rs test/*fail/*.rc))
 
 
 ifdef MINGW_CROSS

src/README

@@ -8,7 +8,6 @@ boot/fe            - Front end (lexer, parser, AST)
 boot/me            - Middle end (resolve, check, layout, trans)
 boot/be            - Back end (IL, RA, insns, asm, objfiles)
 boot/util          - Ubiquitous helpers
-boot/llvm          - LLVM-based alternative back end
 boot/driver        - Compiler driver
 
 comp/              The self-hosted compiler ("rustc": incomplete)