Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit b92234d1b1b527bb56e5b66d206ea50fcb82c381 2 parents 9ec89a9 + 6121ade
Henrik Nordh authored April 06, 2011
1  erts/emulator/hipe/hipe_bif0.h
... ...
@@ -1,6 +1,5 @@
1 1
 /*
2 2
  * %CopyrightBegin%
3  
-
4 3
  *
5 4
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
6 5
  *
1  erts/emulator/hipe/hipe_bif1.c
... ...
@@ -1,6 +1,5 @@
1 1
 /*
2 2
  * %CopyrightBegin%
3  
-
4 3
  *
5 4
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
6 5
  *
1  erts/emulator/hipe/hipe_bif2.c
... ...
@@ -1,6 +1,5 @@
1 1
 /*
2 2
  * %CopyrightBegin%
3  
-
4 3
  *
5 4
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
6 5
  *
8  erts/emulator/hipe/hipe_bif2.tab
... ...
@@ -1,19 +1,19 @@
1 1
 #
2 2
 # %CopyrightBegin%
3  
-# 
  3
+#
4 4
 # Copyright Ericsson AB 2001-2011. All Rights Reserved.
5  
-# 
  5
+#
6 6
 # The contents of this file are subject to the Erlang Public License,
7 7
 # Version 1.1, (the "License"); you may not use this file except in
8 8
 # compliance with the License. You should have received a copy of the
9 9
 # Erlang Public License along with this software. If not, it can be
10 10
 # retrieved online at http://www.erlang.org/.
11  
-# 
  11
+#
12 12
 # Software distributed under the License is distributed on an "AS IS"
13 13
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14 14
 # the License for the specific language governing rights and limitations
15 15
 # under the License.
16  
-# 
  16
+#
17 17
 # %CopyrightEnd%
18 18
 #
19 19
 # HiPE level 2 bifs: miscellaneous add-ons
1  erts/emulator/hipe/hipe_sparc_glue.S
... ...
@@ -1,6 +1,5 @@
1 1
 /*
2 2
  * %CopyrightBegin%
3  
-
4 3
  *
5 4
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
6 5
  *
1  erts/emulator/hipe/hipe_x86_glue.S
... ...
@@ -1,6 +1,5 @@
1 1
 /*
2 2
  * %CopyrightBegin%
3  
-
4 3
  *
5 4
  * Copyright Ericsson AB 2001-2011. All Rights Reserved.
6 5
  *
2  lib/stdlib/src/erl_lint.erl
@@ -2563,7 +2563,7 @@ check_type({type, L, 'fun', [Dom, Range]}, SeenVars, St) ->
2563 2563
     St1 =
2564 2564
 	case Dom of
2565 2565
 	    {type, _, product, _} -> St;
2566  
-	    {type, _, any} -> St;
  2566
+	    {type, _, any, _} -> St;
2567 2567
 	    _ -> add_error(L, {type_syntax, 'fun'}, St)
2568 2568
 	end,
2569 2569
     check_type({type, -1, product, [Dom, Range]}, SeenVars, St1);
2  lib/stdlib/src/erl_parse.yrl
@@ -166,7 +166,7 @@ type -> 'fun' '(' fun_type_100 ')'        : '$3'.
166 166
 
167 167
 fun_type_100 -> '(' '...' ')' '->' top_type
168 168
                                           : {type, ?line('$1'), 'fun',
169  
-                                             [{type, ?line('$1'), any}, '$5']}.
  169
+                                             [{type, ?line('$1'), any, []}, '$5']}.
170 170
 fun_type_100 -> fun_type                  : '$1'.
171 171
 
172 172
 fun_type -> '(' ')' '->' top_type  : {type, ?line('$1'), 'fun',

0 notes on commit b92234d

Please sign in to comment.
Something went wrong with that request. Please try again.