diff options
| author | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-24 18:46:52 +0100 |
| commit | 8d66da63859f1dae9339d1b13f37b0982c052133 (patch) | |
| tree | 540f81d0a507f0eb92084b6c91f28be2809f7fd8 /lib/snmp/src/compile/snmpc_tok.erl | |
| parent | 25bff78c1650c156b31772bf8072441f4edf3759 (diff) | |
| parent | 205d55b2ee2afe70a9cbac6da15c8b985c76f2ab (diff) | |
| download | otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.gz otp-8d66da63859f1dae9339d1b13f37b0982c052133.tar.bz2 otp-8d66da63859f1dae9339d1b13f37b0982c052133.zip | |
[compiler] Added support for the textual convention
AGENT-CAPABILITIES and full support for textual convention
MODULE-COMPLIANCE, both defined by the SNMPv2-CONF mib.
The *reference* and *modules* part(s) are stored in the
assocList field of the mib-entry (me) record.
Only handled if the option(s) agent_capabilities and
module_compliance (respectively) are provided to the
compiler.
For backward compatibillity, the MIBs provided with
this application are *not* compiled with these options.
Merge branch 'bmk/snmp/add_compiler_support_agent_capabilities/OTP-8966' into bmk/snmp/snmp419_integration/OTP-9068
Conflicts:
lib/snmp/test/snmp_compiler_test.erl
Diffstat (limited to 'lib/snmp/src/compile/snmpc_tok.erl')
| -rw-r--r-- | lib/snmp/src/compile/snmpc_tok.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/snmp/src/compile/snmpc_tok.erl b/lib/snmp/src/compile/snmpc_tok.erl index 6b99e7ae43..e238b256d0 100644 --- a/lib/snmp/src/compile/snmpc_tok.erl +++ b/lib/snmp/src/compile/snmpc_tok.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. +%% Copyright Ericsson AB 1996-2010. 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 @@ -37,6 +37,8 @@ -export([null_get_line/0, format_error/1, terminate/2, handle_call/3, init/1, test/0]). +-include("snmpc_lib.hrl"). + %%---------------------------------------------------------------------- %% Reserved_words: list of KeyWords. Example: ['IF', 'BEGIN', ..., 'GOTO'] @@ -130,6 +132,10 @@ test() -> 'current','deprecated','not-accessible','obsolete', 'read-create','read-only','read-write', 'IMPORTS', 'FROM', 'MODULE-COMPLIANCE', + 'AGENT-CAPABILITIES', + 'PRODUCT-RELEASE', + 'SUPPORTS', + 'INCLUDES', 'DisplayString', 'PhysAddress', 'MacAddress', @@ -225,6 +231,7 @@ get_all_tokens(Str,Toks) -> case catch tokenise(Str) of {error, ErrorInfo} -> {error, ErrorInfo}; {Token, RestChars} when is_tuple(Token) -> + %% ?vtrace("get_all_tokens -> Token: ~p", [Token]), get_all_tokens(RestChars, [Token|Toks]) end. |