From 1f3eb5cf1f33dbb47862a7705a6cc15a8e6a261c Mon Sep 17 00:00:00 2001 From: Sami Vaarala Date: Sun, 6 Oct 2013 01:13:22 +0300 Subject: [PATCH] update strings and builtins for Buffer/Pointer prototypes, and some in-progress traceback changes --- src/genbuiltins.py | 82 +++++++++++++++++++++++++++++++++++++++++++--- src/genstrings.py | 14 ++++++-- 2 files changed, 89 insertions(+), 7 deletions(-) diff --git a/src/genbuiltins.py b/src/genbuiltins.py index 9dae0571..9978223e 100644 --- a/src/genbuiltins.py +++ b/src/genbuiltins.py @@ -94,7 +94,7 @@ LENGTH_PROPERTY_ATTRIBUTES = "" DEFAULT_PROPERTY_ATTRIBUTES = "wc" # encoding constants (must match duk_hthread_builtins.c) -CLASS_BITS = 4 +CLASS_BITS = 5 BIDX_BITS = 6 STRIDX_BITS = 9 # FIXME: try to optimize to 8 NATIDX_BITS = 8 @@ -144,6 +144,8 @@ _classnames = [ 'global', 'ObjEnv', 'DecEnv', + 'Buffer', + 'Pointer', ] _class2num = {} for i,v in enumerate(_classnames): @@ -745,7 +747,7 @@ bi_error_prototype = { 'class': 'Error', 'values': [ - # Property attributes: + # Standard properties; property attributes: # # 'message' is writable and deletable. This matches the default # attributes of 'wc'. V8 and Smjs both match this. @@ -764,6 +766,12 @@ bi_error_prototype = { { 'name': 'name', 'value': 'Error' }, { 'name': 'message', 'value': '' }, + + # Custom properties + + { 'name': 'stack', 'value': '' }, + # FIXME: custom properties + ], 'functions': [ { 'name': 'toString', 'native': 'duk_builtin_error_prototype_to_string', 'length': 0 }, @@ -1012,6 +1020,8 @@ bi_duk = { 'values': [ # Note: 'version' and 'build' are added from parameter file. # They are intentionally non-writable and non-configurable now. + { 'name': 'Buffer', 'value': { 'type': 'builtin', 'id': 'bi_buffer_constructor' } }, + { 'name': 'Pointer', 'value': { 'type': 'builtin', 'id': 'bi_pointer_constructor' } }, ], 'functions': [ # FIXME: 'yield' is a bad method name, since yield is a reserved word @@ -1025,10 +1035,10 @@ bi_duk = { { 'name': 'yield', 'native': 'duk_builtin_duk_object_yield', 'length': 2 }, { 'name': 'resume', 'native': 'duk_builtin_duk_object_resume', 'length': 3 }, { 'name': 'curr', 'native': 'duk_builtin_duk_object_curr', 'length': 0 }, - { 'name': 'time', 'native': 'duk_builtin_duk_object_time', 'length': 0 }, { 'name': 'enc', 'native': 'duk_builtin_duk_object_enc', 'length': 2 }, { 'name': 'dec', 'native': 'duk_builtin_duk_object_dec', 'length': 2 }, - { 'name': 'sleep', 'native': 'duk_builtin_duk_object_sleep', 'length': 1 }, +# { 'name': 'time', 'native': 'duk_builtin_duk_object_time', 'length': 0 }, +# { 'name': 'sleep', 'native': 'duk_builtin_duk_object_sleep', 'length': 1 }, ], } @@ -1053,6 +1063,66 @@ bi_thread_prototype = { ], } +bi_buffer_constructor = { + 'internal_prototype': 'bi_function_prototype', + 'external_prototype': 'bi_buffer_prototype', + 'class': 'Function', + 'name': 'Buffer', + + 'length': 1, + 'varargs': True, + 'native': 'duk_builtin_buffer_constructor', + 'callable': True, + 'constructable': True, + + 'values': [], + 'functions': [ + ] +} + +bi_buffer_prototype = { + 'internal_prototype': 'bi_object_prototype', + 'external_constructor': 'bi_buffer_constructor', + 'class': 'Buffer', + + 'values': [ + ], + 'functions': [ + { 'name': 'toString', 'native': 'duk_builtin_buffer_prototype_to_string', 'length': 0 }, + { 'name': 'valueOf', 'native': 'duk_builtin_buffer_prototype_value_of', 'length': 0 }, + ], +} + +bi_pointer_constructor = { + 'internal_prototype': 'bi_function_prototype', + 'external_prototype': 'bi_pointer_prototype', + 'class': 'Function', + 'name': 'Pointer', + + 'length': 1, + 'varargs': True, + 'native': 'duk_builtin_pointer_constructor', + 'callable': True, + 'constructable': True, + + 'values': [], + 'functions': [ + ] +} + +bi_pointer_prototype = { + 'internal_prototype': 'bi_object_prototype', + 'external_constructor': 'bi_pointer_constructor', + 'class': 'Pointer', + + 'values': [ + ], + 'functions': [ + { 'name': 'toString', 'native': 'duk_builtin_pointer_prototype_to_string', 'length': 0 }, + { 'name': 'valueOf', 'native': 'duk_builtin_pointer_prototype_value_of', 'length': 0 }, + ], +} + # This is an Error *instance* used to avoid allocation when a "double error" occurs. # The object is "frozen and sealed" to avoid code accidentally modifying the instance. # This is important because the error is rethrown as is. @@ -1115,6 +1185,10 @@ builtins = [ { 'id': 'bi_type_error_thrower', 'info': bi_type_error_thrower }, { 'id': 'bi_duk', 'info': bi_duk }, { 'id': 'bi_thread_prototype', 'info': bi_thread_prototype }, + { 'id': 'bi_buffer_constructor', 'info': bi_buffer_constructor }, + { 'id': 'bi_buffer_prototype', 'info': bi_buffer_prototype }, + { 'id': 'bi_pointer_constructor', 'info': bi_pointer_constructor }, + { 'id': 'bi_pointer_prototype', 'info': bi_pointer_prototype }, { 'id': 'bi_double_error', 'info': bi_double_error }, ] diff --git a/src/genstrings.py b/src/genstrings.py index fc02e95f..c970c3ce 100644 --- a/src/genstrings.py +++ b/src/genstrings.py @@ -462,19 +462,23 @@ standard_other_string_list = [ duk_string_list = [ # non-standard class values mkstr("global", custom=True, class_name=True), # implementation specific but shared by e.g. smjs and V8 + mkstr("ObjEnv", custom=True, class_name=True), + mkstr("DecEnv", custom=True, class_name=True), + mkstr("Buffer", custom=True, class_name=True), + mkstr("Pointer", custom=True, class_name=True), # non-standard built-in object names mkstr("ThrowTypeError", custom=True), # implementation specific, matches V8 - # non-standard error object properties + # non-standard error object (or Error.prototype) properties + mkstr("stack", custom=True), mkstr("pc", custom=True), mkstr("fileName", custom=True), mkstr("lineNumber", custom=True), mkstr("isNative", custom=True), mkstr("code", custom=True), mkstr("cause", custom=True), - mkstr("traceback", custom=True), - mkstr("trunc", custom=True), # FIXME: unused + mkstr("tracedata", custom=True), # non-standard function instance properties mkstr("name", custom=True), # function declaration/expression name (or empty) @@ -645,6 +649,10 @@ special_define_names = { 'String': 'UC_STRING', 'arguments': 'LC_ARGUMENTS', 'Arguments': 'UC_ARGUMENTS', + 'buffer': 'LC_BUFFER', + 'Buffer': 'UC_BUFFER', + 'pointer': 'LC_POINTER', + 'Pointer': 'UC_POINTER', '+Infinity': 'PLUS_INFINITY', '-Infinity': 'MINUS_INFINITY',