diff options
| -rw-r--r-- | codegen.py | 29 | ||||
| -rw-r--r-- | src/rabbit_binary_generator.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
3 files changed, 12 insertions, 27 deletions
@@ -24,18 +24,6 @@ from amqp_codegen import * import string import re -erlangTypeMap = { - 'octet': 'octet', - 'shortstr': 'shortstr', - 'longstr': 'longstr', - 'short': 'shortint', - 'long': 'longint', - 'longlong': 'longlongint', - 'bit': 'bit', - 'table': 'table', - 'timestamp': 'timestamp', -} - # Coming up with a proper encoding of AMQP tables in JSON is too much # hassle at this stage. Given that the only default value we are # interested in is for the empty table, we only support that. @@ -123,7 +111,7 @@ def printFileHeader(): def genErl(spec): def erlType(domain): - return erlangTypeMap[spec.resolveDomain(domain)] + return erlangize(spec.resolveDomain(domain)) def fieldTypeList(fields): return '[' + ', '.join([erlType(f.domain) for f in fields]) + ']' @@ -186,11 +174,11 @@ def genErl(spec): return p+'Len:32/unsigned, '+p+':'+p+'Len/binary' elif type == 'octet': return p+':8/unsigned' - elif type == 'shortint': + elif type == 'short': return p+':16/unsigned' - elif type == 'longint': + elif type == 'long': return p+':32/unsigned' - elif type == 'longlongint': + elif type == 'longlong': return p+':64/unsigned' elif type == 'timestamp': return p+':64/unsigned' @@ -239,7 +227,7 @@ def genErl(spec): (i, str(field.index + 1), i, i, erlType(field.domain), i) if len(c.fields) == 0: - print "decode_properties(%d, _) ->" % (c.index,) + print "decode_properties(%d, <<>>) ->" % (c.index,) else: print ("decode_properties(%d, %s) ->" % (c.index, presentBin(c.fields))) @@ -340,8 +328,8 @@ def genErl(spec): 'table' | 'byte' | 'double' | 'float' | 'long' | 'short' | 'bool' | 'binary' | 'void' | 'array'). -type(amqp_property_type() :: - 'shortstr' | 'longstr' | 'octet' | 'shortint' | 'longint' | - 'longlongint' | 'timestamp' | 'bit' | 'table'). + 'shortstr' | 'longstr' | 'octet' | 'short' | 'long' | + 'longlong' | 'timestamp' | 'bit' | 'table'). -type(amqp_table() :: [{binary(), amqp_field_type(), amqp_value()}]). -type(amqp_array() :: [{amqp_field_type(), amqp_value()}]). @@ -478,9 +466,6 @@ timestamp_prop(<<I:64/unsigned, X/binary>>) -> print "amqp_exception(_Code) -> undefined." def genHrl(spec): - def erlType(domain): - return erlangTypeMap[spec.resolveDomain(domain)] - def fieldNameList(fields): return ', '.join([erlangize(f.name) for f in fields]) diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl index 6b6b395a..2ece8696 100644 --- a/src/rabbit_binary_generator.erl +++ b/src/rabbit_binary_generator.erl @@ -215,9 +215,9 @@ encode_property(shortstr, String) -> encode_property(longstr, String) -> Len = size(String), <<Len:32, String:Len/binary>>; encode_property(octet, Int) -> <<Int:8/unsigned>>; -encode_property(shortint, Int) -> <<Int:16/unsigned>>; -encode_property(longint, Int) -> <<Int:32/unsigned>>; -encode_property(longlongint, Int) -> <<Int:64/unsigned>>; +encode_property(short, Int) -> <<Int:16/unsigned>>; +encode_property(long, Int) -> <<Int:32/unsigned>>; +encode_property(longlong, Int) -> <<Int:64/unsigned>>; encode_property(timestamp, Int) -> <<Int:64/unsigned>>; encode_property(table, Table) -> table_to_binary(Table). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index eb97f1d6..715aa186 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -444,10 +444,10 @@ test_content_properties() -> test_content_prop_encoding([{bit, true}, {octet, 123}, {octet, 123}, {bit, true}], <<16#F0,0,123,123>>), test_content_prop_encoding([{bit, true}, {shortstr, <<"hi">>}, {bit, true}, - {shortint, 54321}, {bit, true}], + {short, 54321}, {bit, true}], <<16#F8,0,2,"hi",16#D4,16#31>>), test_content_prop_encoding([{bit, true}, {shortstr, undefined}, {bit, true}, - {shortint, 54321}, {bit, true}], + {short, 54321}, {bit, true}], <<16#B8,0,16#D4,16#31>>), test_content_prop_encoding([{table, [{<<"a signedint">>, signedint, 12345678}, {<<"a longstr">>, longstr, <<"yes please">>}, |