Merge branch 'maint-r15' into maint

1 files changed, 35 insertions, 13 deletions

diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl
index 74b9ddaa25..4fd504e34b 100644
--- a/lib/snmp/src/compile/snmpc_mib_gram.yrl
+++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. 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
@@ -244,16 +244,36 @@ listofdefinitions -> definition : ['$1'] .
 listofdefinitions -> listofdefinitions definition : ['$2' | '$1'].
 
 import -> '$empty' : [].
-import -> 'IMPORTS' imports ';' : '$2'.
-
-imports -> imports_from_one_mib : ['$1'].
-imports -> imports_from_one_mib imports : ['$1' | '$2'].
+import -> 'IMPORTS' imports ';' : 
+%%           i("import ->"
+%% 	    "~n   imports: ~p", ['$2']), 
+          '$2'.
+
+imports -> imports_from_one_mib : 
+%%            i("imports ->"
+%%              "~n   imports_from_one_mib: ~p", ['$1']), 
+           ['$1'].
+imports -> imports_from_one_mib imports : 
+%%            i("imports ->"
+%%              "~n   imports_from_one_mib: ~p"
+%%              "~n   imports:              ~p", ['$1', '$2']), 
+           ['$1' | '$2'].
 
 imports_from_one_mib -> listofimports 'FROM' variable :
+%%                         i("imports_from_one_mib ->"
+%%                           "~n   listofimports: ~p"
+%%                           "~n   variable:      ~p", ['$1', '$3']), 
                         {{val('$3'), lreverse(imports_from_one_mib, '$1')}, line_of('$2')}.
 
-listofimports -> import_stuff : ['$1'].
-listofimports -> listofimports ',' import_stuff : ['$3' | '$1'].
+listofimports -> import_stuff : 
+%%                  i("listofimports ->"
+%%                    "~n   import_stuff: ~p", ['$1']), 
+                 ['$1'].
+listofimports -> listofimports ',' import_stuff : 
+%%                  i("listofimports ->"
+%%                    "~n   listofimports: ~p"
+%%                    "~n   import_stuff:  ~p", ['$1', '$3']), 
+                 ['$3' | '$1'].
 
 import_stuff -> 'OBJECT-TYPE' : {builtin, 'OBJECT-TYPE'}.
 import_stuff -> 'TRAP-TYPE' : {builtin, 'TRAP-TYPE'}.
@@ -314,6 +334,8 @@ import_stuff -> 'TDomain'
        : ensure_ver(2,'$1'), {builtin, 'TDomain'}.
 import_stuff -> 'TAddress' 
        : ensure_ver(2,'$1'), {builtin, 'TAddress'}.
+import_stuff -> 'BITS' 
+       : ensure_ver(2,'$1'), {builtin, 'BITS'}.
 
 traptype -> objectname 'TRAP-TYPE' 'ENTERPRISE' objectname varpart
 	    description referpart implies integer :
@@ -748,7 +770,7 @@ statusv1(Tok) ->
         obsolete -> obsolete;
         deprecated -> deprecated;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(statusv1) syntax error before: " ++ atom_to_list(Else))
     end.
 
 statusv2(Tok) ->
@@ -757,7 +779,7 @@ statusv2(Tok) ->
         deprecated -> deprecated;
         obsolete -> obsolete;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(statusv2) syntax error before: " ++ atom_to_list(Else))
     end.
 
 ac_status(Tok) ->
@@ -765,7 +787,7 @@ ac_status(Tok) ->
         current -> current;
         obsolete -> obsolete;
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(ac_status) syntax error before: " ++ atom_to_list(Else))
     end.
 
 accessv1(Tok) ->
@@ -775,7 +797,7 @@ accessv1(Tok) ->
         'write-only' -> 'write-only';
         'not-accessible' -> 'not-accessible';
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(accessv1) syntax error before: " ++ atom_to_list(Else))
     end.
 
 accessv2(Tok) ->
@@ -786,7 +808,7 @@ accessv2(Tok) ->
         'read-write' -> 'read-write';
         'read-create' -> 'read-create';
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(accessv2) syntax error before: " ++ atom_to_list(Else))
     end.
 
 ac_access(Tok) ->
@@ -798,7 +820,7 @@ ac_access(Tok) ->
         'read-create' -> 'read-create';
         'write-only' -> 'write-only'; % for backward-compatibility only
         Else -> return_error(line_of(Tok),
-                             "syntax error before: " ++ atom_to_list(Else))
+                             "(ac_access) syntax error before: " ++ atom_to_list(Else))
     end.
 
 %% ---------------------------------------------------------------------