diff --git a/src/core/chuck_lang.cpp b/src/core/chuck_lang.cpp index 3e1589078..c3fcc03c9 100644 --- a/src/core/chuck_lang.cpp +++ b/src/core/chuck_lang.cpp @@ -857,7 +857,7 @@ t_CKBOOL init_class_string( Chuck_Env * env, Chuck_Type * type ) // add contructor func = make_new_ctor( string_ctor_str ); - func->add_arg( "string", "text" ); + func->add_arg( "string", "str" ); func->doc = "construct a string as a copy of another string."; if( !type_engine_import_ctor( env, func ) ) goto error; diff --git a/src/core/chuck_scan.cpp b/src/core/chuck_scan.cpp index 9101e0c58..a3f15451c 100644 --- a/src/core/chuck_scan.cpp +++ b/src/core/chuck_scan.cpp @@ -2417,12 +2417,12 @@ t_CKBOOL type_engine_scan2_exp_decl_create( Chuck_Env * env, a_Exp_Decl decl ) if( !isaStr ) { EM_error2( decl->where, - "...(primitive types: 'int', 'float', 'time', 'dur', 'complex', 'vec3', etc.)" ); + "...(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); } else { EM_error2( decl->where, - "...(NOTE 'string' is a special kind of Object whose operation includes elements of Object types and primitive types; e.g., instantiation and function argument-passing are similar to any other Object; however assignment '@=>' and '=>' are carried out by-value, like other primitives such as 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); + "...(NOTE 'string' is a special Object whose operational semantics resemble both Object types and primitive types; e.g., instantiation and function argument-passing are like any other Object; however assignment '@=>' and '=>' are carried out by-value, as with primitive types such as 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); } return FALSE; } @@ -2773,7 +2773,7 @@ t_CKBOOL type_engine_scan2_class_def( Chuck_Env * env, a_Class_Def class_def ) EM_error2( class_def->ext->extend_id->where, "cannot extend primitive type '%s'", t_parent->c_name() ); - EM_error2( 0, "...(primitive types: 'int', 'float', 'time', 'dur', 'complex', 'vec3', etc.)" ); + EM_error2( 0, "...(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); return FALSE; } } @@ -2962,7 +2962,7 @@ t_CKBOOL type_engine_scan2_func_def( Chuck_Env * env, a_Func_Def f ) "cannot declare references (@) of primitive type '%s'...", f->ret_type->c_name() ); EM_error2( f->type_decl->where, - "...(primitive types: 'int', 'float', 'time', 'dur', 'complex', 'vec3')" ); + "...(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); goto error; } @@ -3020,7 +3020,7 @@ t_CKBOOL type_engine_scan2_func_def( Chuck_Env * env, a_Func_Def f ) "cannot declare references (@) of primitive type '%s'...", arg_list->type->c_name() ); EM_error2( arg_list->type_decl->where, - "...(primitive types: 'int', 'float', 'time', 'dur', 'complex', 'vec3')" ); + "...(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); goto error; } diff --git a/src/core/chuck_type.cpp b/src/core/chuck_type.cpp index b0ef9103b..581a5fb62 100644 --- a/src/core/chuck_type.cpp +++ b/src/core/chuck_type.cpp @@ -3176,7 +3176,7 @@ t_CKTYPE type_engine_check_exp_unary( Chuck_Env * env, a_Exp_Unary unary ) EM_error2( unary->type->where, "cannot use 'new' on primitive type '%s'...", t->c_name() ); - EM_error2( 0, "(primitive types: 'int', 'float', 'time', 'dur', 'complex', 'vec3', etc.)" ); + EM_error2( 0, "(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)" ); return NULL; } diff --git a/src/test/06-Errors/error-extend.txt b/src/test/06-Errors/error-extend.txt index 9a04d1ae0..960c43be1 100644 --- a/src/test/06-Errors/error-extend.txt +++ b/src/test/06-Errors/error-extend.txt @@ -1,4 +1,4 @@ error-extend.ck:1:17: error: cannot extend primitive type 'int' [1] class I extends int ^ -error-extend.ck: ...(primitive types: 'int', 'float', 'time', 'dur', etc.) +error-extend.ck: ...(primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.) diff --git a/src/test/06-Errors/error-new-prim.txt b/src/test/06-Errors/error-new-prim.txt index e39d7c53b..c59483d38 100644 --- a/src/test/06-Errors/error-new-prim.txt +++ b/src/test/06-Errors/error-new-prim.txt @@ -1,4 +1,4 @@ error-new-prim.ck:1:5: error: cannot use 'new' on primitive type 'int'... [1] new int; ^ -error-new-prim.ck: (primitive types: 'int', 'float', 'time', 'dur', etc.) +error-new-prim.ck: (primitive types: 'int', 'float', 'time', 'dur', 'vec3', etc.)