Merge branch 'ks/any-arity-fun' into pu

Conflicts: erts/emulator/hipe/hipe_bif0.h erts/emulator/hipe/hipe_bif1.c erts/emulator/hipe/hipe_bif2.c erts/emulator/hipe/hipe_sparc_glue.S erts/emulator/hipe/hipe_x86_glue.S
erlang · Apr 6, 2011 · b92234d · b92234d
2 parents 9ec89a9 + 6121ade
commit b92234d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/erts/emulator/hipe/hipe_bif0.h b/erts/emulator/hipe/hipe_bif0.h
@@ -1,6 +1,5 @@
 /*
  * %CopyrightBegin%
-
  *
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
  *

diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
@@ -1,6 +1,5 @@
 /*
  * %CopyrightBegin%
-
  *
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
  *

diff --git a/erts/emulator/hipe/hipe_bif2.c b/erts/emulator/hipe/hipe_bif2.c
@@ -1,6 +1,5 @@
 /*
  * %CopyrightBegin%
-
  *
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
  *

diff --git a/erts/emulator/hipe/hipe_bif2.tab b/erts/emulator/hipe/hipe_bif2.tab
@@ -1,19 +1,19 @@
 #
 # %CopyrightBegin%
-# 
+#
 # Copyright Ericsson AB 2001-2011. All Rights Reserved.
-# 
+#
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 #
 # HiPE level 2 bifs: miscellaneous add-ons

diff --git a/erts/emulator/hipe/hipe_sparc_glue.S b/erts/emulator/hipe/hipe_sparc_glue.S
@@ -1,6 +1,5 @@
 /*
  * %CopyrightBegin%
-
  *
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
  *

diff --git a/erts/emulator/hipe/hipe_x86_glue.S b/erts/emulator/hipe/hipe_x86_glue.S
@@ -1,6 +1,5 @@
 /*
  * %CopyrightBegin%
-
  *
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
  *

diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
@@ -2563,7 +2563,7 @@ check_type({type, L, 'fun', [Dom, Range]}, SeenVars, St) ->
     St1 =
 	case Dom of
 	    {type, _, product, _} -> St;
-	    {type, _, any} -> St;
+	    {type, _, any, _} -> St;
 	    _ -> add_error(L, {type_syntax, 'fun'}, St)
 	end,
     check_type({type, -1, product, [Dom, Range]}, SeenVars, St1);

diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
@@ -166,7 +166,7 @@ type -> 'fun' '(' fun_type_100 ')'        : '$3'.
 
 fun_type_100 -> '(' '...' ')' '->' top_type
                                           : {type, ?line('$1'), 'fun',
-                                             [{type, ?line('$1'), any}, '$5']}.
+                                             [{type, ?line('$1'), any, []}, '$5']}.
 fun_type_100 -> fun_type                  : '$1'.
 
 fun_type -> '(' ')' '->' top_type  : {type, ?line('$1'), 'fun',