objective-lol 0.0.1__cp311-cp311-win_amd64.whl → 0.0.2__cp311-cp311-win_amd64.whl

objective_lol/api.py

@@ -741,6 +741,114 @@ TimeoutErrorType = "timeout"
 
 # ---- Structs ---
 
+# Python type for struct api.UnknownFunctionHandler
+class UnknownFunctionHandler(go.GoClass):
+	""""""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_api.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_api.IncRef(self.handle)
+		else:
+			self.handle = _api.api_UnknownFunctionHandler_CTor()
+			_api.IncRef(self.handle)
+	def __del__(self):
+		_api.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.UnknownFunctionHandler{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.UnknownFunctionHandler ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+
+# Python type for struct api.ClassMethod
+class ClassMethod(go.GoClass):
+	""""""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_api.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_api.IncRef(self.handle)
+		else:
+			self.handle = _api.api_ClassMethod_CTor()
+			_api.IncRef(self.handle)
+			if  0 < len(args):
+				self.Name = args[0]
+			if "Name" in kwargs:
+				self.Name = kwargs["Name"]
+			if  1 < len(args):
+				self.Argc = args[1]
+			if "Argc" in kwargs:
+				self.Argc = kwargs["Argc"]
+	def __del__(self):
+		_api.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.ClassMethod{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.ClassMethod ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	@property
+	def Name(self):
+		return _api.api_ClassMethod_Name_Get(self.handle)
+	@Name.setter
+	def Name(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ClassMethod_Name_Set(self.handle, value.handle)
+		else:
+			_api.api_ClassMethod_Name_Set(self.handle, value)
+	@property
+	def Argc(self):
+		return _api.api_ClassMethod_Argc_Get(self.handle)
+	@Argc.setter
+	def Argc(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ClassMethod_Argc_Set(self.handle, value.handle)
+		else:
+			_api.api_ClassMethod_Argc_Set(self.handle, value)
+
 # Python type for struct api.SourceLocation
 class SourceLocation(go.GoClass):
 	"""SourceLocation represents a location in source code\n"""
@@ -821,9 +929,9 @@ class SourceLocation(go.GoClass):
 		else:
 			_api.api_SourceLocation_Column_Set(self.handle, value)
 
-# Python type for struct api.VM
-class VM(go.GoClass):
-	"""VM represents an Objective-LOL virtual machine instance\n"""
+# Python type for struct api.ExecutionResult
+class ExecutionResult(go.GoClass):
+	"""ExecutionResult represents the result of executing Objective-LOL code\n"""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -837,13 +945,25 @@ class VM(go.GoClass):
 			self.handle = args[0].handle
 			_api.IncRef(self.handle)
 		else:
-			self.handle = _api.api_VM_CTor()
+			self.handle = _api.api_ExecutionResult_CTor()
 			_api.IncRef(self.handle)
+			if  0 < len(args):
+				self.Value = args[0]
+			if "Value" in kwargs:
+				self.Value = kwargs["Value"]
+			if  1 < len(args):
+				self.RawValue = args[1]
+			if "RawValue" in kwargs:
+				self.RawValue = kwargs["RawValue"]
+			if  2 < len(args):
+				self.Output = args[2]
+			if "Output" in kwargs:
+				self.Output = kwargs["Output"]
 	def __del__(self):
 		_api.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.VM{'
+		sv = 'api.ExecutionResult{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -856,69 +976,48 @@ class VM(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.VM ( '
+		sv = 'api.ExecutionResult ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def GetCompatibilityShim(self):
-		"""GetCompatibilityShim() object
-		
-		GetCompatibilityShim returns a compatibility shim for the VM
-		"""
-		return VMCompatibilityShim(handle=_api.api_VM_GetCompatibilityShim(self.handle))
-	def Execute(self, code):
-		"""Execute(str code) object, str
-		
-		Execute executes Objective-LOL code from a string
-		"""
-		return ExecutionResult(handle=_api.api_VM_Execute(self.handle, code))
-	def ExecuteWithContext(self, ctx, code):
-		"""ExecuteWithContext(object ctx, str code) object, str
-		
-		ExecuteWithContext executes code with a context for cancellation/timeout
-		"""
-		return ExecutionResult(handle=_api.api_VM_ExecuteWithContext(self.handle, ctx.handle, code))
-	def NewObjectInstance(self, className):
-		"""NewObjectInstance(str className) object, str"""
-		return GoValue(handle=_api.api_VM_NewObjectInstance(self.handle, className))
-	def Call(self, functionName, args):
-		"""Call(str functionName, []object args) object, str
-		
-		Call calls an Objective-LOL function with the given arguments
-		"""
-		return GoValue(handle=_api.api_VM_Call(self.handle, functionName, args.handle))
-	def CallMethod(self, object, methodName, args):
-		"""CallMethod(object object, str methodName, []object args) object, str
-		
-		CallMethod calls a method on an Objective-LOL object
-		"""
-		return GoValue(handle=_api.api_VM_CallMethod(self.handle, object.handle, methodName, args.handle))
-	def DefineVariable(self, name, value, constant):
-		"""DefineVariable(str name, object value, bool constant) str
-		
-		DefineVariable defines a global variable in the VM
+	@property
+	def Value(self):
+		"""Return value from the execution (e.g., from MAIN function)
 		"""
-		return _api.api_VM_DefineVariable(self.handle, name, value.handle, constant)
-	def SetVariable(self, variableName, value):
-		"""SetVariable(str variableName, object value) str
-		
-		SetVariable sets a variable in the global environment
+		return GoValue(handle=_api.api_ExecutionResult_Value_Get(self.handle))
+	@Value.setter
+	def Value(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ExecutionResult_Value_Set(self.handle, value.handle)
+		else:
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+	@property
+	def RawValue(self):
+		"""Raw Objective-LOL value (for advanced use)
 		"""
-		return _api.api_VM_SetVariable(self.handle, variableName, value.handle)
-	def GetVariable(self, variableName):
-		"""GetVariable(str variableName) object, str
-		
-		Get gets a variable from the global environment
+		return go.environment_Value(handle=_api.api_ExecutionResult_RawValue_Get(self.handle))
+	@RawValue.setter
+	def RawValue(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ExecutionResult_RawValue_Set(self.handle, value.handle)
+		else:
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+	@property
+	def Output(self):
+		"""Output captured during execution (if configured)
 		"""
-		return GoValue(handle=_api.api_VM_GetVariable(self.handle, variableName))
-	def DefineClass(self, classDef):
-		"""DefineClass(object classDef) str"""
-		return _api.api_VM_DefineClass(self.handle, classDef.handle)
+		return _api.api_ExecutionResult_Output_Get(self.handle)
+	@Output.setter
+	def Output(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ExecutionResult_Output_Set(self.handle, value.handle)
+		else:
+			_api.api_ExecutionResult_Output_Set(self.handle, value)
 
-# Python type for struct api.VMCompatibilityShim
-class VMCompatibilityShim(go.GoClass):
-	"""VMCompatibilityShim is a shim to provide compatibility for external\nlanguages that cannot interact with the standard VM interface through\nGo types. Message passing is done through JSON strings.\n"""
+# Python type for struct api.GoValue
+class GoValue(go.GoClass):
+	""""""
 	def __init__(self, *args, **kwargs):
 		"""
 		handle=A Go-side object is always initialized with an explicit handle=arg
@@ -932,13 +1031,13 @@ class VMCompatibilityShim(go.GoClass):
 			self.handle = args[0].handle
 			_api.IncRef(self.handle)
 		else:
-			self.handle = _api.api_VMCompatibilityShim_CTor()
+			self.handle = _api.api_GoValue_CTor()
 			_api.IncRef(self.handle)
 	def __del__(self):
 		_api.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.VMCompatibilityShim{'
+		sv = 'api.GoValue{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -951,42 +1050,208 @@ class VMCompatibilityShim(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.VMCompatibilityShim ( '
+		sv = 'api.GoValue ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
-	def DefineFunction(self, id, name, argc, function):
-		"""DefineFunction(str id, str name, int argc, callable function) str
-		
-		DefineFunction defines a global function with maximum compatibility,
-		wrapping arguments and return values as JSON strings.
-		An optional id cookie is passed back to the function to identify it.
-		jsonArgs is a JSON array string of the arguments.
-		The function should return a JSON object string with "result" and "error" fields.
-		"""
-		return _api.api_VMCompatibilityShim_DefineFunction(self.handle, id, name, argc, function)
-	def BuildNewClassVariableWithGetter(self, variable, getterID, getter):
-		"""BuildNewClassVariableWithGetter(object variable, str getterID, callable getter) object"""
-		return ClassVariable(handle=_api.api_VMCompatibilityShim_BuildNewClassVariableWithGetter(self.handle, variable.handle, getterID, getter))
-	def BuildNewClassVariableWithSetter(self, variable, setterID, setter):
-		"""BuildNewClassVariableWithSetter(object variable, str setterID, callable setter) object"""
-		return ClassVariable(handle=_api.api_VMCompatibilityShim_BuildNewClassVariableWithSetter(self.handle, variable.handle, setterID, setter))
-	def BuildNewClassMethod(self, method, id, function):
-		"""BuildNewClassMethod(object method, str id, callable function) object"""
-		return ClassMethod(handle=_api.api_VMCompatibilityShim_BuildNewClassMethod(self.handle, method.handle, id, function))
-	def BuildNewUnknownFunctionHandler(self, id, function):
-		"""BuildNewUnknownFunctionHandler(str id, callable function) object"""
-		return UnknownFunctionHandler(handle=_api.api_VMCompatibilityShim_BuildNewUnknownFunctionHandler(self.handle, id, function))
-	def IsClassDefined(self, name):
-		"""IsClassDefined(str name) bool"""
-		return _api.api_VMCompatibilityShim_IsClassDefined(self.handle, name)
-	def LookupObject(self, id):
-		"""LookupObject(str id) object, str"""
-		return GoValue(handle=_api.api_VMCompatibilityShim_LookupObject(self.handle, id))
-	def GetObjectMRO(self, id):
-		"""GetObjectMRO(str id) []str, str"""
-		return go.Slice_string(handle=_api.api_VMCompatibilityShim_GetObjectMRO(self.handle, id))
+	def ID(self):
+		"""ID() str"""
+		return _api.api_GoValue_ID(self.handle)
+	def MarshalJSON(self):
+		"""MarshalJSON() []int, str"""
+		return go.Slice_byte(handle=_api.api_GoValue_MarshalJSON(self.handle))
+	def Type(self):
+		"""Type() str"""
+		return _api.api_GoValue_Type(self.handle)
+	def Int(self):
+		"""Int() long, str"""
+		return _api.api_GoValue_Int(self.handle)
+	def Float(self):
+		"""Float() float, str"""
+		return _api.api_GoValue_Float(self.handle)
+	def String(self):
+		"""String() str, str"""
+		return _api.api_GoValue_String(self.handle)
+	def Bool(self):
+		"""Bool() bool, str"""
+		return _api.api_GoValue_Bool(self.handle)
+	def Slice(self):
+		"""Slice() []object, str"""
+		return Slice_api_GoValue(handle=_api.api_GoValue_Slice(self.handle))
+	def Map(self):
+		"""Map() object, str"""
+		return Map_string_api_GoValue(handle=_api.api_GoValue_Map(self.handle))
+	def Object(self):
+		"""Object() object, str"""
+		return go.Ptr_environment_ObjectInstance(handle=_api.api_GoValue_Object(self.handle))
+
+# Python type for struct api.VM
+class VM(go.GoClass):
+	"""VM represents an Objective-LOL virtual machine instance\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_api.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_api.IncRef(self.handle)
+		else:
+			self.handle = _api.api_VM_CTor()
+			_api.IncRef(self.handle)
+	def __del__(self):
+		_api.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.VM{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.VM ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	def GetCompatibilityShim(self):
+		"""GetCompatibilityShim() object
+		
+		GetCompatibilityShim returns a compatibility shim for the VM
+		"""
+		return VMCompatibilityShim(handle=_api.api_VM_GetCompatibilityShim(self.handle))
+	def Execute(self, code):
+		"""Execute(str code) object, str
+		
+		Execute executes Objective-LOL code from a string
+		"""
+		return ExecutionResult(handle=_api.api_VM_Execute(self.handle, code))
+	def ExecuteWithContext(self, ctx, code):
+		"""ExecuteWithContext(object ctx, str code) object, str
+		
+		ExecuteWithContext executes code with a context for cancellation/timeout
+		"""
+		return ExecutionResult(handle=_api.api_VM_ExecuteWithContext(self.handle, ctx.handle, code))
+	def NewObjectInstance(self, className):
+		"""NewObjectInstance(str className) object, str"""
+		return GoValue(handle=_api.api_VM_NewObjectInstance(self.handle, className))
+	def Call(self, functionName, args):
+		"""Call(str functionName, []object args) object, str
+		
+		Call calls an Objective-LOL function with the given arguments
+		"""
+		return GoValue(handle=_api.api_VM_Call(self.handle, functionName, args.handle))
+	def CallMethod(self, object, methodName, args):
+		"""CallMethod(object object, str methodName, []object args) object, str
+		
+		CallMethod calls a method on an Objective-LOL object
+		"""
+		return GoValue(handle=_api.api_VM_CallMethod(self.handle, object.handle, methodName, args.handle))
+	def DefineVariable(self, name, value, constant):
+		"""DefineVariable(str name, object value, bool constant) str
+		
+		DefineVariable defines a global variable in the VM
+		"""
+		return _api.api_VM_DefineVariable(self.handle, name, value.handle, constant)
+	def SetVariable(self, variableName, value):
+		"""SetVariable(str variableName, object value) str
+		
+		SetVariable sets a variable in the global environment
+		"""
+		return _api.api_VM_SetVariable(self.handle, variableName, value.handle)
+	def GetVariable(self, variableName):
+		"""GetVariable(str variableName) object, str
+		
+		Get gets a variable from the global environment
+		"""
+		return GoValue(handle=_api.api_VM_GetVariable(self.handle, variableName))
+	def DefineClass(self, classDef):
+		"""DefineClass(object classDef) str"""
+		return _api.api_VM_DefineClass(self.handle, classDef.handle)
+
+# Python type for struct api.VMCompatibilityShim
+class VMCompatibilityShim(go.GoClass):
+	"""VMCompatibilityShim is a shim to provide compatibility for external\nlanguages that cannot interact with the standard VM interface through\nGo types. Message passing is done through JSON strings.\n"""
+	def __init__(self, *args, **kwargs):
+		"""
+		handle=A Go-side object is always initialized with an explicit handle=arg
+		otherwise parameters can be unnamed in order of field names or named fields
+		in which case a new Go object is constructed first
+		"""
+		if len(kwargs) == 1 and 'handle' in kwargs:
+			self.handle = kwargs['handle']
+			_api.IncRef(self.handle)
+		elif len(args) == 1 and isinstance(args[0], go.GoClass):
+			self.handle = args[0].handle
+			_api.IncRef(self.handle)
+		else:
+			self.handle = _api.api_VMCompatibilityShim_CTor()
+			_api.IncRef(self.handle)
+	def __del__(self):
+		_api.DecRef(self.handle)
+	def __str__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.VMCompatibilityShim{'
+		first = True
+		for v in pr:
+			if callable(v[1]):
+				continue
+			if first:
+				first = False
+			else:
+				sv += ', '
+			sv += v[0] + '=' + str(v[1])
+		return sv + '}'
+	def __repr__(self):
+		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
+		sv = 'api.VMCompatibilityShim ( '
+		for v in pr:
+			if not callable(v[1]):
+				sv += v[0] + '=' + str(v[1]) + ', '
+		return sv + ')'
+	def DefineFunction(self, id, name, argc, function):
+		"""DefineFunction(str id, str name, int argc, callable function) str
+		
+		DefineFunction defines a global function with maximum compatibility,
+		wrapping arguments and return values as JSON strings.
+		An optional id cookie is passed back to the function to identify it.
+		jsonArgs is a JSON array string of the arguments.
+		The function should return a JSON object string with "result" and "error" fields.
+		"""
+		return _api.api_VMCompatibilityShim_DefineFunction(self.handle, id, name, argc, function)
+	def BuildNewClassVariableWithGetter(self, variable, getterID, getter):
+		"""BuildNewClassVariableWithGetter(object variable, str getterID, callable getter) object"""
+		return ClassVariable(handle=_api.api_VMCompatibilityShim_BuildNewClassVariableWithGetter(self.handle, variable.handle, getterID, getter))
+	def BuildNewClassVariableWithSetter(self, variable, setterID, setter):
+		"""BuildNewClassVariableWithSetter(object variable, str setterID, callable setter) object"""
+		return ClassVariable(handle=_api.api_VMCompatibilityShim_BuildNewClassVariableWithSetter(self.handle, variable.handle, setterID, setter))
+	def BuildNewClassMethod(self, method, id, function):
+		"""BuildNewClassMethod(object method, str id, callable function) object"""
+		return ClassMethod(handle=_api.api_VMCompatibilityShim_BuildNewClassMethod(self.handle, method.handle, id, function))
+	def BuildNewUnknownFunctionHandler(self, id, function):
+		"""BuildNewUnknownFunctionHandler(str id, callable function) object"""
+		return UnknownFunctionHandler(handle=_api.api_VMCompatibilityShim_BuildNewUnknownFunctionHandler(self.handle, id, function))
+	def IsClassDefined(self, name):
+		"""IsClassDefined(str name) bool"""
+		return _api.api_VMCompatibilityShim_IsClassDefined(self.handle, name)
+	def LookupObject(self, id):
+		"""LookupObject(str id) object, str"""
+		return GoValue(handle=_api.api_VMCompatibilityShim_LookupObject(self.handle, id))
+	def GetObjectMRO(self, id):
+		"""GetObjectMRO(str id) []str, str"""
+		return go.Slice_string(handle=_api.api_VMCompatibilityShim_GetObjectMRO(self.handle, id))
 	def GetObjectImmediateFunctions(self, id):
 		"""GetObjectImmediateFunctions(str id) []str, str"""
 		return go.Slice_string(handle=_api.api_VMCompatibilityShim_GetObjectImmediateFunctions(self.handle, id))
@@ -1361,8 +1626,8 @@ class ClassDefinition(go.GoClass):
 		else:
 			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
 
-# Python type for struct api.ClassMethod
-class ClassMethod(go.GoClass):
+# Python type for struct api.ClassVariable
+class ClassVariable(go.GoClass):
 	""""""
 	def __init__(self, *args, **kwargs):
 		"""
@@ -1377,21 +1642,25 @@ class ClassMethod(go.GoClass):
 			self.handle = args[0].handle
 			_api.IncRef(self.handle)
 		else:
-			self.handle = _api.api_ClassMethod_CTor()
+			self.handle = _api.api_ClassVariable_CTor()
 			_api.IncRef(self.handle)
 			if  0 < len(args):
 				self.Name = args[0]
 			if "Name" in kwargs:
 				self.Name = kwargs["Name"]
 			if  1 < len(args):
-				self.Argc = args[1]
-			if "Argc" in kwargs:
-				self.Argc = kwargs["Argc"]
+				self.Value = args[1]
+			if "Value" in kwargs:
+				self.Value = kwargs["Value"]
+			if  2 < len(args):
+				self.Locked = args[2]
+			if "Locked" in kwargs:
+				self.Locked = kwargs["Locked"]
 	def __del__(self):
 		_api.DecRef(self.handle)
 	def __str__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ClassMethod{'
+		sv = 'api.ClassVariable{'
 		first = True
 		for v in pr:
 			if callable(v[1]):
@@ -1404,307 +1673,38 @@ class ClassMethod(go.GoClass):
 		return sv + '}'
 	def __repr__(self):
 		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ClassMethod ( '
+		sv = 'api.ClassVariable ( '
 		for v in pr:
 			if not callable(v[1]):
 				sv += v[0] + '=' + str(v[1]) + ', '
 		return sv + ')'
 	@property
 	def Name(self):
-		return _api.api_ClassMethod_Name_Get(self.handle)
+		return _api.api_ClassVariable_Name_Get(self.handle)
 	@Name.setter
 	def Name(self, value):
 		if isinstance(value, go.GoClass):
-			_api.api_ClassMethod_Name_Set(self.handle, value.handle)
+			_api.api_ClassVariable_Name_Set(self.handle, value.handle)
 		else:
-			_api.api_ClassMethod_Name_Set(self.handle, value)
+			_api.api_ClassVariable_Name_Set(self.handle, value)
 	@property
-	def Argc(self):
-		return _api.api_ClassMethod_Argc_Get(self.handle)
-	@Argc.setter
-	def Argc(self, value):
+	def Value(self):
+		return GoValue(handle=_api.api_ClassVariable_Value_Get(self.handle))
+	@Value.setter
+	def Value(self, value):
 		if isinstance(value, go.GoClass):
-			_api.api_ClassMethod_Argc_Set(self.handle, value.handle)
+			_api.api_ClassVariable_Value_Set(self.handle, value.handle)
 		else:
-			_api.api_ClassMethod_Argc_Set(self.handle, value)
-
-# Python type for struct api.ClassVariable
-class ClassVariable(go.GoClass):
-	""""""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_api.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_api.IncRef(self.handle)
-		else:
-			self.handle = _api.api_ClassVariable_CTor()
-			_api.IncRef(self.handle)
-			if  0 < len(args):
-				self.Name = args[0]
-			if "Name" in kwargs:
-				self.Name = kwargs["Name"]
-			if  1 < len(args):
-				self.Value = args[1]
-			if "Value" in kwargs:
-				self.Value = kwargs["Value"]
-			if  2 < len(args):
-				self.Locked = args[2]
-			if "Locked" in kwargs:
-				self.Locked = kwargs["Locked"]
-	def __del__(self):
-		_api.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ClassVariable{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ClassVariable ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	@property
-	def Name(self):
-		return _api.api_ClassVariable_Name_Get(self.handle)
-	@Name.setter
-	def Name(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ClassVariable_Name_Set(self.handle, value.handle)
-		else:
-			_api.api_ClassVariable_Name_Set(self.handle, value)
-	@property
-	def Value(self):
-		return GoValue(handle=_api.api_ClassVariable_Value_Get(self.handle))
-	@Value.setter
-	def Value(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ClassVariable_Value_Set(self.handle, value.handle)
-		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
-	@property
-	def Locked(self):
-		return _api.api_ClassVariable_Locked_Get(self.handle)
-	@Locked.setter
-	def Locked(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ClassVariable_Locked_Set(self.handle, value.handle)
-		else:
-			_api.api_ClassVariable_Locked_Set(self.handle, value)
-
-# Python type for struct api.ExecutionResult
-class ExecutionResult(go.GoClass):
-	"""ExecutionResult represents the result of executing Objective-LOL code\n"""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_api.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_api.IncRef(self.handle)
-		else:
-			self.handle = _api.api_ExecutionResult_CTor()
-			_api.IncRef(self.handle)
-			if  0 < len(args):
-				self.Value = args[0]
-			if "Value" in kwargs:
-				self.Value = kwargs["Value"]
-			if  1 < len(args):
-				self.RawValue = args[1]
-			if "RawValue" in kwargs:
-				self.RawValue = kwargs["RawValue"]
-			if  2 < len(args):
-				self.Output = args[2]
-			if "Output" in kwargs:
-				self.Output = kwargs["Output"]
-	def __del__(self):
-		_api.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ExecutionResult{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.ExecutionResult ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	@property
-	def Value(self):
-		"""Return value from the execution (e.g., from MAIN function)
-		"""
-		return GoValue(handle=_api.api_ExecutionResult_Value_Get(self.handle))
-	@Value.setter
-	def Value(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ExecutionResult_Value_Set(self.handle, value.handle)
-		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
-	@property
-	def RawValue(self):
-		"""Raw Objective-LOL value (for advanced use)
-		"""
-		return go.environment_Value(handle=_api.api_ExecutionResult_RawValue_Get(self.handle))
-	@RawValue.setter
-	def RawValue(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ExecutionResult_RawValue_Set(self.handle, value.handle)
-		else:
-			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
-	@property
-	def Output(self):
-		"""Output captured during execution (if configured)
-		"""
-		return _api.api_ExecutionResult_Output_Get(self.handle)
-	@Output.setter
-	def Output(self, value):
-		if isinstance(value, go.GoClass):
-			_api.api_ExecutionResult_Output_Set(self.handle, value.handle)
-		else:
-			_api.api_ExecutionResult_Output_Set(self.handle, value)
-
-# Python type for struct api.GoValue
-class GoValue(go.GoClass):
-	""""""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_api.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_api.IncRef(self.handle)
-		else:
-			self.handle = _api.api_GoValue_CTor()
-			_api.IncRef(self.handle)
-	def __del__(self):
-		_api.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.GoValue{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.GoValue ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
-	def ID(self):
-		"""ID() str"""
-		return _api.api_GoValue_ID(self.handle)
-	def MarshalJSON(self):
-		"""MarshalJSON() []int, str"""
-		return go.Slice_byte(handle=_api.api_GoValue_MarshalJSON(self.handle))
-	def Type(self):
-		"""Type() str"""
-		return _api.api_GoValue_Type(self.handle)
-	def Int(self):
-		"""Int() long, str"""
-		return _api.api_GoValue_Int(self.handle)
-	def Float(self):
-		"""Float() float, str"""
-		return _api.api_GoValue_Float(self.handle)
-	def String(self):
-		"""String() str, str"""
-		return _api.api_GoValue_String(self.handle)
-	def Bool(self):
-		"""Bool() bool, str"""
-		return _api.api_GoValue_Bool(self.handle)
-	def Slice(self):
-		"""Slice() []object, str"""
-		return Slice_api_GoValue(handle=_api.api_GoValue_Slice(self.handle))
-	def Map(self):
-		"""Map() object, str"""
-		return Map_string_api_GoValue(handle=_api.api_GoValue_Map(self.handle))
-	def Object(self):
-		"""Object() object, str"""
-		return go.Ptr_environment_ObjectInstance(handle=_api.api_GoValue_Object(self.handle))
-
-# Python type for struct api.UnknownFunctionHandler
-class UnknownFunctionHandler(go.GoClass):
-	""""""
-	def __init__(self, *args, **kwargs):
-		"""
-		handle=A Go-side object is always initialized with an explicit handle=arg
-		otherwise parameters can be unnamed in order of field names or named fields
-		in which case a new Go object is constructed first
-		"""
-		if len(kwargs) == 1 and 'handle' in kwargs:
-			self.handle = kwargs['handle']
-			_api.IncRef(self.handle)
-		elif len(args) == 1 and isinstance(args[0], go.GoClass):
-			self.handle = args[0].handle
-			_api.IncRef(self.handle)
-		else:
-			self.handle = _api.api_UnknownFunctionHandler_CTor()
-			_api.IncRef(self.handle)
-	def __del__(self):
-		_api.DecRef(self.handle)
-	def __str__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.UnknownFunctionHandler{'
-		first = True
-		for v in pr:
-			if callable(v[1]):
-				continue
-			if first:
-				first = False
-			else:
-				sv += ', '
-			sv += v[0] + '=' + str(v[1])
-		return sv + '}'
-	def __repr__(self):
-		pr = [(p, getattr(self, p)) for p in dir(self) if not p.startswith('__')]
-		sv = 'api.UnknownFunctionHandler ( '
-		for v in pr:
-			if not callable(v[1]):
-				sv += v[0] + '=' + str(v[1]) + ', '
-		return sv + ')'
+			raise TypeError("supplied argument type {t} is not a go.GoClass".format(t=type(value)))
+	@property
+	def Locked(self):
+		return _api.api_ClassVariable_Locked_Get(self.handle)
+	@Locked.setter
+	def Locked(self, value):
+		if isinstance(value, go.GoClass):
+			_api.api_ClassVariable_Locked_Set(self.handle, value.handle)
+		else:
+			_api.api_ClassVariable_Locked_Set(self.handle, value)
 
 
 # ---- Slices ---
@@ -1714,6 +1714,30 @@ class UnknownFunctionHandler(go.GoClass):
 
 
 # ---- Constructors ---
+def WrapBool(value):
+	"""WrapBool(bool value) object"""
+	return GoValue(handle=_api.api_WrapBool(value))
+def WrapObject(value):
+	"""WrapObject(object value) object"""
+	return GoValue(handle=_api.api_WrapObject(value.handle))
+def WrapAny(value):
+	"""WrapAny(str value) object"""
+	return GoValue(handle=_api.api_WrapAny(value))
+def WrapInt(value):
+	"""WrapInt(long value) object"""
+	return GoValue(handle=_api.api_WrapInt(value))
+def ToGoValue(val):
+	"""ToGoValue(object val) object, str
+	
+	ToGoValue converts an Objective-LOL value to a Go value
+	"""
+	return GoValue(handle=_api.api_ToGoValue(val.handle))
+def WrapFloat(value):
+	"""WrapFloat(float value) object"""
+	return GoValue(handle=_api.api_WrapFloat(value))
+def WrapString(value):
+	"""WrapString(str value) object"""
+	return GoValue(handle=_api.api_WrapString(value))
 def NewVM(config):
 	"""NewVM(object config) object, str
 	
@@ -1726,63 +1750,39 @@ def DefaultConfig():
 	DefaultConfig returns a default configuration
 	"""
 	return VMConfig(handle=_api.api_DefaultConfig())
-def NewCompileError(message, source):
-	"""NewCompileError(str message, object source) object
+def NewRuntimeError(message, source):
+	"""NewRuntimeError(str message, object source) object
 	
-	NewCompileError creates a new compile error
+	NewRuntimeError creates a new runtime error
 	"""
-	return VMError(handle=_api.api_NewCompileError(message, source.handle))
+	return VMError(handle=_api.api_NewRuntimeError(message, source.handle))
 def NewTimeoutError(duration):
 	"""NewTimeoutError(long duration) object
 	
 	NewTimeoutError creates a new timeout error
 	"""
 	return VMError(handle=_api.api_NewTimeoutError(duration))
-def NewConfigError(message, wrapped):
-	"""NewConfigError(str message, str wrapped) object
-	
-	NewConfigError creates a new configuration error
-	"""
-	return VMError(handle=_api.api_NewConfigError(message, wrapped))
 def NewConversionError(message, wrapped):
 	"""NewConversionError(str message, str wrapped) object
 	
 	NewConversionError creates a new type conversion error
 	"""
 	return VMError(handle=_api.api_NewConversionError(message, wrapped))
-def NewRuntimeError(message, source):
-	"""NewRuntimeError(str message, object source) object
+def NewCompileError(message, source):
+	"""NewCompileError(str message, object source) object
 	
-	NewRuntimeError creates a new runtime error
+	NewCompileError creates a new compile error
 	"""
-	return VMError(handle=_api.api_NewRuntimeError(message, source.handle))
+	return VMError(handle=_api.api_NewCompileError(message, source.handle))
+def NewConfigError(message, wrapped):
+	"""NewConfigError(str message, str wrapped) object
+	
+	NewConfigError creates a new configuration error
+	"""
+	return VMError(handle=_api.api_NewConfigError(message, wrapped))
 def NewClassDefinition():
 	"""NewClassDefinition() object"""
 	return ClassDefinition(handle=_api.api_NewClassDefinition())
-def ToGoValue(val):
-	"""ToGoValue(object val) object, str
-	
-	ToGoValue converts an Objective-LOL value to a Go value
-	"""
-	return GoValue(handle=_api.api_ToGoValue(val.handle))
-def WrapObject(value):
-	"""WrapObject(object value) object"""
-	return GoValue(handle=_api.api_WrapObject(value.handle))
-def WrapBool(value):
-	"""WrapBool(bool value) object"""
-	return GoValue(handle=_api.api_WrapBool(value))
-def WrapString(value):
-	"""WrapString(str value) object"""
-	return GoValue(handle=_api.api_WrapString(value))
-def WrapInt(value):
-	"""WrapInt(long value) object"""
-	return GoValue(handle=_api.api_WrapInt(value))
-def WrapAny(value):
-	"""WrapAny(str value) object"""
-	return GoValue(handle=_api.api_WrapAny(value))
-def WrapFloat(value):
-	"""WrapFloat(float value) object"""
-	return GoValue(handle=_api.api_WrapFloat(value))
 
 
 # ---- Functions ---