Permalink
Browse files

Merge branch 'version-14_01-branch'

  • Loading branch information...
2 parents f299434 + a302f20 commit fae91b93d3d9f6fbedf724dafd4fee7d943b7ca3 @PaulBone PaulBone committed Feb 27, 2014
@@ -2,5 +2,7 @@
P=`pwd`/libatomic_ops-install
cd libatomic_ops
# Mercury-specific: allow additional arguments.
-./configure --prefix=$P "$@"
+# Mercury-specific: explicitly set --libdir to avoid some 64-bit Linux
+# systems installing in $P/lib64.
+./configure --prefix=$P --libdir=$P/lib "$@"
$MAKE CC="$CC" AR="$AR" RANLIB="$RANLIB" install
View
@@ -446,7 +446,7 @@ Operator Specifier Priority
`@var{op}` yfx 120 @footnote{Operator term (@pxref{Terms}).}
** xfy 200
- fx 200
-\\ fx 200
+\ fx 200
* yfx 400
/ yfx 400
// yfx 400
@@ -460,8 +460,8 @@ rem xfx 400
++ xfy 500
- yfx 500
-- yfx 500
-/\\ yfx 500
-\\/ yfx 500
+/\ yfx 500
+\/ yfx 500
.. xfx 550
:= xfx 650
=^ xfx 650
@@ -471,15 +471,15 @@ rem xfx 400
=:= xfx 700
=< xfx 700
== xfx 700
-=\\= xfx 700
+=\= xfx 700
> xfx 700
>= xfx 700
@@< xfx 700
@@=< xfx 700
@@> xfx 700
@@>= xfx 700
-\\= xfx 700
-\\== xfx 700
+\= xfx 700
+\== xfx 700
~= xfx 700
is xfx 701
and xfy 720
@@ -488,7 +488,7 @@ func fx 800
impure fy 800
pred fx 800
semipure fy 800
-\\+ fy 900
+\+ fy 900
not fy 900
when xfx 900
~ fy 900
View
@@ -0,0 +1,11 @@
+Mercury
+Mercury/**
+*.mh
+*.init
+*.err
+*.jar
+*.exe
+lib*.dylib
+lib*.dll
+lib*.so
+lib*.a
@@ -0,0 +1 @@
+fft
@@ -0,0 +1,3 @@
+complex_test
+complex_test.out
+complex_test.res
@@ -0,0 +1,3 @@
+demo
+frogger
+nibbles
@@ -0,0 +1 @@
+smalltest
@@ -0,0 +1,4 @@
+dl.m
+dl_test
+dl_test2
+name_mangle.m
@@ -0,0 +1,5 @@
+bounce
+mclock
+moveball
+scribble
+testeasyx
@@ -221,7 +221,7 @@
VX = 0.001 + float(VX0 mod 100) / 10000.0,
VY = 0.0,
R = 0.025 + float(R0 mod 25) / 1000.0,
- C = index0_det(Colours, 2 + (N0 / 1000) mod (length(Colours) - 2)),
+ C = det_index0(Colours, 2 + (N0 / 1000) mod (length(Colours) - 2)),
Ball = ball(X, Y, VX, VY, R, C).
%-----------------------------------------------------------------------------%
@@ -252,8 +252,8 @@
play(Window, Colours, !Paddle, !Objects, !Rnd, !IO) :-
- Black = index0_det(Colours, 0),
- White = index0_det(Colours, 1),
+ Black = det_index0(Colours, 0),
+ White = det_index0(Colours, 1),
easyx.set_colour(Window, Black, !IO),
easyx.clear_window(Window, !IO),
@@ -0,0 +1,8 @@
+exdata
+exhello
+exjoy
+exmouse
+exscroll
+exspline
+exsprite
+extimer
@@ -198,8 +198,8 @@
calc_tangents(Nodes0, Tangents) :-
Len = length(Nodes0),
- Head = dummy_node(index0_det(Nodes0, 0), index0_det(Nodes0, 1)),
- Tail = dummy_node(index0_det(Nodes0, Len-1), index0_det(Nodes0, Len-2)),
+ Head = dummy_node(det_index0(Nodes0, 0), det_index0(Nodes0, 1)),
+ Tail = dummy_node(det_index0(Nodes0, Len-1), det_index0(Nodes0, Len-2)),
( list.take(Len-1, Nodes0, ButLast) ->
Tangents = list.map_corresponding(calc_tangent,
[Head | ButLast], det_tail(Nodes0) ++ [Tail])
@@ -0,0 +1,4 @@
+demo/demo
+pendulum2/pendulum2
+mandel/mandel
+speed/speed
@@ -272,10 +272,10 @@
),
J = (RetraceCount / (6 - (C /\ 3)) + C) mod 15,
Frame = (if even(C) then 14 - J else J),
- Sprite = list.index0_det(Anim, Frame).
+ Sprite = list.det_index0(Anim, Frame).
get_asteroid_sprite(Data, exploding(Frame), _, _, Sprite) :-
- Sprite = list.index0_det(Data ^ explosions, Frame).
+ Sprite = list.det_index0(Data ^ explosions, Frame).
%-----------------------------------------------------------------------------%
@@ -185,7 +185,7 @@
).
update_view(view(ViewNum, {A0, B0, C0, D0}), view(ViewNum, {A, B, C, D})) :-
- list.index0_det(view_configurations, ViewNum, {PosA, PosB, PosC, PosD}),
+ list.det_index0(view_configurations, ViewNum, {PosA, PosB, PosC, PosD}),
update_viewinfo(PosA, A0, A),
update_viewinfo(PosB, B0, B),
update_viewinfo(PosC, C0, C),
@@ -0,0 +1,19 @@
+*.png
+arc
+arc_negative
+clip
+clip_image
+curve_to
+dash
+fill_and_stroke2
+fill_style
+gradient
+hello
+image
+imagepattern
+multi_segment_caps
+set_line_cap
+set_line_join
+text
+text_align_center
+text_extents
@@ -0,0 +1,3 @@
+gears
+listmodes
+triangle
@@ -0,0 +1,6 @@
+calc/calc
+calc/calc
+gears/gears
+gears/gears
+maze/maze
+pent/pent
@@ -0,0 +1,2 @@
+lex_demo
+regex_demo
View
@@ -0,0 +1 @@
+moose
@@ -0,0 +1,6 @@
+alpha.m
+try_alpha
+expr.m
+try_expr
+small.m
+cgram.m
View
@@ -0,0 +1 @@
+hello
@@ -0,0 +1,2 @@
+interpreter
+vqueens
View
@@ -0,0 +1 @@
+tryit
View
@@ -87,7 +87,7 @@ case "$C_COMPILER_TYPE" in
DISABLE_OPTS_OPT="-O0"
COMPILER=lcc
;;
- msvc*)
+ msvc*|cl*)
ANSI_OPTS=""
CHECK_OPTS="-nologo" # Suppress the MSVC banner message.
OPT_OPTS=""

0 comments on commit fae91b9

Please sign in to comment.