Commit d0f7b91e authored by Lev Walkin's avatar Lev Walkin

print object sets tables for all information object sets

parent 02da2aab
...@@ -774,14 +774,15 @@ asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, enum asn1pri ...@@ -774,14 +774,15 @@ asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, enum asn1pri
safe_printf("\n"); safe_printf("\n");
} }
if(flags & APF_PRINT_CLASS_MATRIX if(flags & APF_PRINT_CLASS_MATRIX) do {
&& tc->expr_type == A1TC_CLASSDEF) do {
size_t col, maxidlen; size_t col, maxidlen;
if(tc->object_class_matrix.rows == 0) { if(tc->object_class_matrix.rows == 0) {
safe_printf("\n-- Class matrix is empty"); if(tc->expr_type == A1TC_CLASSDEF) {
safe_printf("\n-- Information Object Class table is empty");
}
break; break;
} }
safe_printf("\n-- Class matrix has %d entr%s:\n", safe_printf("\n-- Information Object Set has %d entr%s:\n",
tc->object_class_matrix.rows, tc->object_class_matrix.rows,
tc->object_class_matrix.rows==1 ? "y" : "ies"); tc->object_class_matrix.rows==1 ? "y" : "ies");
maxidlen = tc->object_class_matrix.max_identifier_length; maxidlen = tc->object_class_matrix.max_identifier_length;
......
...@@ -14,13 +14,18 @@ FRAME-STRUCTURE ::= CLASS { ...@@ -14,13 +14,18 @@ FRAME-STRUCTURE ::= CLASS {
&Type ANY &Type ANY
} WITH SYNTAX {&Type IDENTIFIED BY &id} } WITH SYNTAX {&Type IDENTIFIED BY &id}
-- Class matrix has 2 entries: -- Information Object Set has 2 entries:
-- [ &id][ &Type] -- [ &id][ &Type]
-- [1] basicMessage PrimitiveMessage -- [1] basicMessage PrimitiveMessage
-- [2] 2 ComplexMessage -- [2] 2 ComplexMessage
FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } | { ComplexMessage IDENTIFIED BY 2 },...} FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } | { ComplexMessage IDENTIFIED BY 2 },...}
-- Information Object Set has 2 entries:
-- [ &id][ &Type]
-- [1] basicMessage PrimitiveMessage
-- [2] 2 ComplexMessage
PrimitiveMessage ::= SEQUENCE { } PrimitiveMessage ::= SEQUENCE { }
......
...@@ -14,17 +14,30 @@ FRAME-STRUCTURE ::= CLASS { ...@@ -14,17 +14,30 @@ FRAME-STRUCTURE ::= CLASS {
&Type ANY &Type ANY
} WITH SYNTAX {&Type IDENTIFIED BY &id} } WITH SYNTAX {&Type IDENTIFIED BY &id}
-- Class matrix has 2 entries: -- Information Object Set has 2 entries:
-- [ &id][ &Type] -- [ &id][ &Type]
-- [1] basicMessage PrimitiveMessage -- [1] basicMessage PrimitiveMessage
-- [2] 2 ComplexMessage -- [2] 2 ComplexMessage
FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } | { ComplexMessage IDENTIFIED BY 2 },...} FrameTypes FRAME-STRUCTURE ::= {{ PrimitiveMessage IDENTIFIED BY basicMessage } | { ComplexMessage IDENTIFIED BY 2 },...}
-- Information Object Set has 2 entries:
-- [ &id][ &Type]
-- [1] basicMessage PrimitiveMessage
-- [2] 2 ComplexMessage
primType FRAME-STRUCTURE ::= { PrimitiveMessage IDENTIFIED BY basicMessage } primType FRAME-STRUCTURE ::= { PrimitiveMessage IDENTIFIED BY basicMessage }
-- Information Object Set has 1 entry:
-- [ &id][ &Type]
-- [1] basicMessage PrimitiveMessage
complexType FRAME-STRUCTURE ::= { ComplexMessage IDENTIFIED BY 2 } complexType FRAME-STRUCTURE ::= { ComplexMessage IDENTIFIED BY 2 }
-- Information Object Set has 1 entry:
-- [ &id][ &Type]
-- [1] 2 ComplexMessage
PrimitiveMessage ::= SEQUENCE { } PrimitiveMessage ::= SEQUENCE { }
......
...@@ -11,7 +11,7 @@ EXTENSION ::= CLASS { ...@@ -11,7 +11,7 @@ EXTENSION ::= CLASS {
IDENTIFIED BY &id IDENTIFIED BY &id
} }
-- Class matrix is empty -- Information Object Class table is empty
Ext1 ::= SEQUENCE { Ext1 ::= SEQUENCE {
extnId EXTENSION.&id extnId EXTENSION.&id
...@@ -22,12 +22,16 @@ EXTENSION-ATTRIBUTE ::= CLASS { ...@@ -22,12 +22,16 @@ EXTENSION-ATTRIBUTE ::= CLASS {
&Type ANY &Type ANY
} WITH SYNTAX {&Type IDENTIFIED BY &id} } WITH SYNTAX {&Type IDENTIFIED BY &id}
-- Class matrix has 1 entry: -- Information Object Set has 1 entry:
-- [ &id][ &Type] -- [ &id][ &Type]
-- [1] 23 TerminalType -- [1] 23 TerminalType
terminal-type EXTENSION-ATTRIBUTE ::= {TerminalType IDENTIFIED BY 23} terminal-type EXTENSION-ATTRIBUTE ::= {TerminalType IDENTIFIED BY 23}
-- Information Object Set has 1 entry:
-- [ &id][ &Type]
-- [1] 23 TerminalType
TerminalType ::= INTEGER { TerminalType ::= INTEGER {
terminal(0) terminal(0)
......
...@@ -13,7 +13,7 @@ SAMPLE-CLASS ::= CLASS { ...@@ -13,7 +13,7 @@ SAMPLE-CLASS ::= CLASS {
&Type OPTIONAL &Type OPTIONAL
} WITH SYNTAX { [TYPE &Type] [WITH CODE &code] IDENTIFIED BY &id } } WITH SYNTAX { [TYPE &Type] [WITH CODE &code] IDENTIFIED BY &id }
-- Class matrix has 4 entries: -- Information Object Set has 4 entries:
-- [ &id][ &code][ &Type] -- [ &id][ &code][ &Type]
-- [1] request-whatever <no entry> <no entry> -- [1] request-whatever <no entry> <no entry>
-- [2] response-stuff 1 <no entry> -- [2] response-stuff 1 <no entry>
...@@ -22,14 +22,37 @@ SAMPLE-CLASS ::= CLASS { ...@@ -22,14 +22,37 @@ SAMPLE-CLASS ::= CLASS {
SampleClassObjectSet SAMPLE-CLASS ::= {{ IDENTIFIED BY request-whatever } | { WITH CODE 1 IDENTIFIED BY response-stuff } | { TYPE SampleType WITH CODE 2 IDENTIFIED BY request-id } | { TYPE Salt IDENTIFIED BY request-salt }} SampleClassObjectSet SAMPLE-CLASS ::= {{ IDENTIFIED BY request-whatever } | { WITH CODE 1 IDENTIFIED BY response-stuff } | { TYPE SampleType WITH CODE 2 IDENTIFIED BY request-id } | { TYPE Salt IDENTIFIED BY request-salt }}
-- Information Object Set has 4 entries:
-- [ &id][ &code][ &Type]
-- [1] request-whatever <no entry> <no entry>
-- [2] response-stuff 1 <no entry>
-- [3] request-id 2 SampleType
-- [4] request-salt <no entry> Salt
request-Whatever SAMPLE-CLASS ::= { IDENTIFIED BY request-whatever } request-Whatever SAMPLE-CLASS ::= { IDENTIFIED BY request-whatever }
-- Information Object Set has 1 entry:
-- [ &id][ &code][ &Type]
-- [1] request-whatever <no entry> <no entry>
respond-Stuff SAMPLE-CLASS ::= { WITH CODE 1 IDENTIFIED BY response-stuff } respond-Stuff SAMPLE-CLASS ::= { WITH CODE 1 IDENTIFIED BY response-stuff }
-- Information Object Set has 1 entry:
-- [ &id][ &code][ &Type]
-- [1] response-stuff 1 <no entry>
request-Status SAMPLE-CLASS ::= { TYPE SampleType WITH CODE 2 IDENTIFIED BY request-id } request-Status SAMPLE-CLASS ::= { TYPE SampleType WITH CODE 2 IDENTIFIED BY request-id }
-- Information Object Set has 1 entry:
-- [ &id][ &code][ &Type]
-- [1] request-id 2 SampleType
request-Salt SAMPLE-CLASS ::= { TYPE Salt IDENTIFIED BY request-salt } request-Salt SAMPLE-CLASS ::= { TYPE Salt IDENTIFIED BY request-salt }
-- Information Object Set has 1 entry:
-- [ &id][ &code][ &Type]
-- [1] request-salt <no entry> Salt
request-id RELATIVE-OID ::= { 1 1 1 } request-id RELATIVE-OID ::= { 1 1 1 }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment