Merge branch 'lukas/tools/emacs_add_error_bif/OTP-10774'

* lukas/tools/emacs_add_error_bif/OTP-10774:
  Update all bif highlighting for emacs

3 files changed, 147 insertions, 18 deletions

diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index d473611eaf..21615f4cd9 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -723,9 +723,6 @@ resulting regexp is surrounded by \\_< and \\_>."
 (eval-and-compile
   (defvar erlang-int-bifs
     '("abs"
-      "adler32"
-      "adler32_combine"
-      "alive"
       "apply"
       "atom_to_binary"
       "atom_to_list"
@@ -733,19 +730,20 @@ resulting regexp is surrounded by \\_< and \\_>."
       "binary_to_existing_atom"
       "binary_to_list"
       "binary_to_term"
+      "binary_part"
       "bit_size"
+      "bitsize"
       "bitstring_to_list"
       "byte_size"
+      "check_old_code"
       "check_process_code"
-      "contact_binary"
-      "crc32"
-      "crc32_combine"
       "date"
-      "decode_packet"
       "delete_module"
+      "demonitor"
       "disconnect_node"
       "element"
       "erase"
+      "error"
       "exit"
       "float"
       "float_to_list"
@@ -756,7 +754,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "halt"
       "hd"
       "integer_to_list"
-      "internal_bif"
       "iolist_size"
       "iolist_to_binary"
       "is_alive"
@@ -787,13 +784,13 @@ resulting regexp is surrounded by \\_< and \\_>."
       "list_to_tuple"
       "load_module"
       "make_ref"
+      "max"
+      "min"
       "module_loaded"
+      "monitor"
       "monitor_node"
       "node"
-      "node_link"
-      "node_unlink"
       "nodes"
-      "notalive"
       "now"
       "open_port"
       "pid_to_list"
@@ -837,48 +834,102 @@ resulting regexp is surrounded by \\_< and \\_>."
 
 (eval-and-compile
   (defvar erlang-ext-bifs
-    '("append_element"
+    '("adler32"
+      "adler32_combine"
+      "alloc_info"
+      "alloc_sizes"
+      "append"
+      "append_element"
+      "await_proc_exit"
+      "await_sched_wall_time_modifications"
+      "bitstr_to_list"
       "bump_reductions"
+      "call_on_load_function"
       "cancel_timer"
-      "demonitor"
+      "crasher"
+      "crc32"
+      "crc32_combine"
+      "decode_packet"
+      "delay_trap"
+      "delete_element"
+      "dexit"
+      "dgroup_leader"
       "display"
+      "display_nl"
+      "display_string"
+      "dist_exit"
+      "dlink"
+      "dmonitor_node"
+      "dmonitor_p"
+      "dsend"
+      "dt_append_vm_tag_data"
+      "dt_get_tag"
+      "dt_get_tag_data"
+      "dt_prepend_vm_tag_data"
+      "dt_put_tag"
+      "dt_restore_tag"
+      "dt_spread_tag"
+      "dunlink"
+      "external_size"
+      "finish_after_on_load"
+      "finish_loading"
+      "flush_monitor_message"
+      "format_cpu_topology"
       "fun_info"
       "fun_to_list"
       "function_exported"
+      "garbage_collect_message_area"
+      "gather_sched_wall_time_result"
       "get_cookie"
+      "get_module_info"
       "get_stacktrace"
       "hash"
-      "integer_to_list"
+      "hibernate"
+      "insert_element"
       "is_builtin"
-      "list_to_integer"
+      "list_to_bitstr"
+      "load_nif"
       "loaded"
       "localtime"
       "localtime_to_universaltime"
+      "make_fun"
       "make_tuple"
-      "max"
+      "match_spec_test"
       "md5"
       "md5_final"
       "md5_init"
       "md5_update"
       "memory"
-      "min"
-      "monitor"
+      "module_info"
       "monitor_node"
+      "nif_error"
       "phash"
       "phash2"
       "port_call"
+      "port_get_data"
       "port_info"
+      "port_set_data"
       "port_to_list"
       "ports"
+      "posixtime_to_universaltime"
+      "prepare_loading"
       "process_display"
+      "raise"
       "read_timer"
       "ref_to_list"
       "resume_process"
       "send"
       "send_after"
       "send_nosuspend"
+      "seq_trace"
+      "seq_trace_info"
+      "seq_trace_print"
       "set_cookie"
+      "set_cpu_topology"
+      "setnode"
+      "spawn_opt"
       "start_timer"
+      "subtract"
       "suspend_process"
       "system_flag"
       "system_info"
@@ -890,6 +941,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "trace_pattern"
       "universaltime"
       "universaltime_to_localtime"
+      "universaltime_to_posixtime"
       "yield")
     "Erlang built-in functions (BIFs) that needs erlang: prefix"))
 
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 86c81217b6..484cfdf53f 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -22,6 +22,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES =  \
 	cover_SUITE \
 	eprof_SUITE \
+	emacs_SUITE \
 	emem_SUITE \
 	fprof_SUITE \
 	cprof_SUITE \
diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
new file mode 100644
index 0000000000..369b8c3ab5
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -0,0 +1,76 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-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%
+%%
+-module(emacs_SUITE).
+
+%%-define(line_trace, 1).
+
+-export([all/0, init_per_testcase/2, end_per_testcase/2]).
+
+-export([bif_highlight/1]).
+
+all() -> 
+    [bif_highlight].
+
+init_per_testcase(_Case, Config) ->
+    ErlangEl = filename:join([code:lib_dir(tools),"emacs","erlang.el"]),
+    case file:read_file_info(ErlangEl) of
+	{ok, _} ->
+	    [{el, ErlangEl}|Config];
+	_ ->
+	    {skip, "Could not find erlang.el"}
+    end.
+
+end_per_testcase(_Case, _Config) ->
+    ok.
+
+bif_highlight(Config) ->
+    ErlangEl = proplists:get_value(el,Config),
+    {ok, Bin} = file:read_file(ErlangEl),
+
+    %% All auto-imported bifs
+    IntBifs = lists:usort(
+		[F  || {F,A} <- erlang:module_info(exports),
+		       erl_internal:bif(F,A)]),
+
+    %% all bif which need erlang: prefix and are not operands
+    ExtBifs = lists:usort(
+		[F  || {F,A} <- erlang:module_info(exports),
+		       not erl_internal:bif(F,A) andalso
+			   not is_atom(catch erl_internal:op_type(F,A))]),
+
+    check_bif_highlight(Bin, <<"erlang-int-bifs">>, IntBifs),
+    check_bif_highlight(Bin, <<"erlang-ext-bifs">>, ExtBifs).
+    
+
+check_bif_highlight(Bin, Tag, Compare) ->
+    [_H,IntMatch,_T] = 
+	re:split(Bin,<<"defvar ",Tag/binary,
+		       "[^(]*\\(([^)]*)">>,[]),
+    EmacsIntBifs = [list_to_atom(S) || 
+		  S <- string:tokens(binary_to_list(IntMatch)," '\"\n")],
+    
+    ct:log("Emacs ~p",[EmacsIntBifs]),
+    ct:log("Int ~p",[Compare]),
+
+    ct:log("Diff1 ~p",[Compare -- EmacsIntBifs]),
+    ct:log("Diff2 ~p",[EmacsIntBifs -- Compare]),
+    [] = Compare -- EmacsIntBifs,
+    [] = EmacsIntBifs -- Compare.
+    
+