Merge branch 'maint'

* maint:
  [snmp] Correct bug when path to mib contains UTF-8 characters
  [ic] Fix but when UTF-8 character in path to idl spec
  sys_core_fold: Don't move a fun into a guard

5 files changed, 39 insertions, 19 deletions

diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index b8065176a3..caa30a5ef4 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -468,7 +468,8 @@ bitstr(#c_bitstr{val=Val,size=Size}=BinSeg, Sub) ->
 %%  Currently, we don't attempt to check binaries because they
 %%  are difficult to check.
 
-is_safe_simple(#c_var{}, _) -> true;
+is_safe_simple(#c_var{}=Var, _) ->
+    not cerl:is_c_fname(Var);
 is_safe_simple(#c_cons{hd=H,tl=T}, Sub) ->
     is_safe_simple(H, Sub) andalso is_safe_simple(T, Sub);
 is_safe_simple(#c_tuple{es=Es}, Sub) -> is_safe_simple_list(Es, Sub);
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 376d2c8e9a..ced0e39d06 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -26,7 +26,7 @@
 	 unused_multiple_values_error/1,unused_multiple_values/1,
 	 multiple_aliases/1,redundant_boolean_clauses/1,
 	 mixed_matching_clauses/1,unnecessary_building/1,
-	 no_no_file/1]).
+	 no_no_file/1,configuration/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -45,7 +45,7 @@ groups() ->
        unused_multiple_values_error,unused_multiple_values,
        multiple_aliases,redundant_boolean_clauses,
        mixed_matching_clauses,unnecessary_building,
-       no_no_file]}].
+       no_no_file,configuration]}].
 
 
 init_per_suite(Config) ->
@@ -499,4 +499,16 @@ experiment() ->
     end,
     ok.
 
+
+%% Make sure we don't try to move a fun into a guard.
+configuration(_Config) ->
+    {'EXIT',_} = (catch configuration()),
+    ok.
+
+configuration() ->
+    [forgotten || Components <- enemy, is_tuple(fun art/0)].
+
+art() ->
+ creating.
+
 id(I) -> I.
diff --git a/lib/ic/src/ic_codegen.erl b/lib/ic/src/ic_codegen.erl
index adad021da1..a3f141f606 100644
--- a/lib/ic/src/ic_codegen.erl
+++ b/lib/ic/src/ic_codegen.erl
@@ -245,8 +245,8 @@ emit_stub_head(G, F1, Name, java) ->
 stub_header(G, Name) ->
     ["Implementation stub file",
      "",
-     io_lib:format("Target: ~s", [Name]),
-     io_lib:format("Source: ~s", [ic_genobj:idlfile(G)]),
+     io_lib:format("Target: ~ts", [Name]),
+     io_lib:format("Source: ~ts", [ic_genobj:idlfile(G)]),
      io_lib:format("IC vsn: ~s", [?COMPILERVSN]),
      "",
      "This file is automatically generated. DO NOT EDIT IT."].
@@ -298,8 +298,8 @@ emit_hrl_head(G, Fd, Name, c_server) ->
 
 hrl_header(G, Name) ->
     ["",
-     io_lib:format("Target: ~s", [Name]),
-     io_lib:format("Source: ~s", [ic_genobj:idlfile(G)]),
+     io_lib:format("Target: ~ts", [Name]),
+     io_lib:format("Source: ~ts", [ic_genobj:idlfile(G)]),
      io_lib:format("IC vsn: ~s", [?COMPILERVSN]),
      "",
      "This file is automatically generated. DO NOT EDIT IT."].
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index db1f9ee61b..d86692aaf6 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -64,7 +64,7 @@ compile(Input, _Output, Options) ->
         {ok, _} ->
             ok;
         {error, Reason} ->
-            io:format("~p", [Reason]),
+            io:format("~tp", [Reason]),
             error
     end.
 
@@ -126,7 +126,14 @@ compile(FileName) ->
 %%----------------------------------------------------------------------
 
 compile(FileName, Options) when is_list(FileName) ->
-    true = snmpc_misc:is_string(FileName),
+    case snmpc_misc:check_file(FileName) of
+	true ->
+	    compile_1(FileName, Options);
+	false ->
+	    {error, {invalid_file, FileName}}
+    end.
+
+compile_1(FileName, Options) ->
     DefOpts = [{deprecated,  true},
 	       {group_check, true},
 	       {i,           ["./"]},
diff --git a/lib/snmp/src/compile/snmpc_misc.erl b/lib/snmp/src/compile/snmpc_misc.erl
index 933d629746..312074f2e7 100644
--- a/lib/snmp/src/compile/snmpc_misc.erl
+++ b/lib/snmp/src/compile/snmpc_misc.erl
@@ -29,7 +29,7 @@
 	 bits_to_int/2,
 	 ensure_trailing_dir_delimiter/1,
 	 foreach/3,
-	 is_string/1,
+	 check_file/1,
 	 read_mib/1,
 	 read_noexit/2,
 	 strip_extension_from_filename/2,
@@ -86,21 +86,21 @@ to_upper([C|Cs]) -> [C|to_upper(Cs)];
 to_upper([]) -> [].
 
 
-is_string([]) -> true;
-is_string([Tkn | Str]) 
-  when is_integer(Tkn) andalso (Tkn >= 0) andalso (Tkn =< 255) ->
-    is_string(Str);
-is_string(_) -> false.
-
-
+check_file(FileName) ->
+    case filename:extension(FileName) of
+	".mib" ->
+	    filelib:is_regular(FileName);
+	_ ->
+	    filelib:is_regular(FileName ++ ".mib")
+    end.
+	
+    
 foreach(Function, ExtraArgs, [H | T]) ->
     apply(Function, [H | ExtraArgs]),
     foreach(Function, ExtraArgs, T);
 foreach(_Function, _ExtraArgs, []) -> 
     true.
 
-
-
 %%----------------------------------------------------------------------
 %% Returns: {ok, Mib}|{error, Reason}
 %% The reason for having the function if this module is: