objective-lol 0.0.1__cp310-cp310-win_amd64.whl → 0.0.2__cp310-cp310-win_amd64.whl

objective_lol/api.go

@@ -2272,6 +2272,97 @@ func Map_string_api_GoValue_keys(handle CGoHandle) CGoHandle {
 
 // ---- Structs ---
 
+// --- wrapping struct: api.ClassDefinition ---
+//
+//export api_ClassDefinition_CTor
+func api_ClassDefinition_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_ClassDefinition(&api.ClassDefinition{}))
+}
+
+//export api_ClassDefinition_Name_Get
+func api_ClassDefinition_Name_Get(handle CGoHandle) *C.char {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return C.CString(op.Name)
+}
+
+//export api_ClassDefinition_Name_Set
+func api_ClassDefinition_Name_Set(handle CGoHandle, val *C.char) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.Name = C.GoString(val)
+}
+
+//export api_ClassDefinition_PublicVariables_Get
+func api_ClassDefinition_PublicVariables_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.PublicVariables)
+}
+
+//export api_ClassDefinition_PublicVariables_Set
+func api_ClassDefinition_PublicVariables_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.PublicVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
+}
+
+//export api_ClassDefinition_PrivateVariables_Get
+func api_ClassDefinition_PrivateVariables_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.PrivateVariables)
+}
+
+//export api_ClassDefinition_PrivateVariables_Set
+func api_ClassDefinition_PrivateVariables_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.PrivateVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
+}
+
+//export api_ClassDefinition_SharedVariables_Get
+func api_ClassDefinition_SharedVariables_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.SharedVariables)
+}
+
+//export api_ClassDefinition_SharedVariables_Set
+func api_ClassDefinition_SharedVariables_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.SharedVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
+}
+
+//export api_ClassDefinition_PublicMethods_Get
+func api_ClassDefinition_PublicMethods_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Map_string_Ptr_api_ClassMethod(&op.PublicMethods)
+}
+
+//export api_ClassDefinition_PublicMethods_Set
+func api_ClassDefinition_PublicMethods_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.PublicMethods = deptrFromHandle_Map_string_Ptr_api_ClassMethod(val)
+}
+
+//export api_ClassDefinition_PrivateMethods_Get
+func api_ClassDefinition_PrivateMethods_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Map_string_Ptr_api_ClassMethod(&op.PrivateMethods)
+}
+
+//export api_ClassDefinition_PrivateMethods_Set
+func api_ClassDefinition_PrivateMethods_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.PrivateMethods = deptrFromHandle_Map_string_Ptr_api_ClassMethod(val)
+}
+
+//export api_ClassDefinition_UnknownFunctionHandler_Get
+func api_ClassDefinition_UnknownFunctionHandler_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	return handleFromPtr_Ptr_api_UnknownFunctionHandler(op.UnknownFunctionHandler)
+}
+
+//export api_ClassDefinition_UnknownFunctionHandler_Set
+func api_ClassDefinition_UnknownFunctionHandler_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ClassDefinition(handle)
+	op.UnknownFunctionHandler = ptrFromHandle_Ptr_api_UnknownFunctionHandler(val)
+}
+
 // --- wrapping struct: api.ClassMethod ---
 //
 //export api_ClassMethod_CTor
@@ -2346,220 +2437,152 @@ func api_ClassVariable_Locked_Set(handle CGoHandle, val C.char) {
 	op.Locked = boolPyToGo(val)
 }
 
-// --- wrapping struct: api.SourceLocation ---
+// --- wrapping struct: api.ExecutionResult ---
 //
-//export api_SourceLocation_CTor
-func api_SourceLocation_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_SourceLocation(&api.SourceLocation{}))
+//export api_ExecutionResult_CTor
+func api_ExecutionResult_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_ExecutionResult(&api.ExecutionResult{}))
 }
 
-//export api_SourceLocation_Filename_Get
-func api_SourceLocation_Filename_Get(handle CGoHandle) *C.char {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	return C.CString(op.Filename)
+//export api_ExecutionResult_Value_Get
+func api_ExecutionResult_Value_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	return handleFromPtr_api_GoValue(&op.Value)
 }
 
-//export api_SourceLocation_Filename_Set
-func api_SourceLocation_Filename_Set(handle CGoHandle, val *C.char) {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	op.Filename = C.GoString(val)
+//export api_ExecutionResult_Value_Set
+func api_ExecutionResult_Value_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	op.Value = *ptrFromHandle_api_GoValue(val)
 }
 
-//export api_SourceLocation_Line_Get
-func api_SourceLocation_Line_Get(handle CGoHandle) C.longlong {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	return C.longlong(op.Line)
+//export api_ExecutionResult_RawValue_Get
+func api_ExecutionResult_RawValue_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	return handleFromPtr_environment_Value(op.RawValue)
 }
 
-//export api_SourceLocation_Line_Set
-func api_SourceLocation_Line_Set(handle CGoHandle, val C.longlong) {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	op.Line = int(val)
+//export api_ExecutionResult_RawValue_Set
+func api_ExecutionResult_RawValue_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	op.RawValue = ptrFromHandle_environment_Value(val)
 }
 
-//export api_SourceLocation_Column_Get
-func api_SourceLocation_Column_Get(handle CGoHandle) C.longlong {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	return C.longlong(op.Column)
+//export api_ExecutionResult_Output_Get
+func api_ExecutionResult_Output_Get(handle CGoHandle) *C.char {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	return C.CString(op.Output)
 }
 
-//export api_SourceLocation_Column_Set
-func api_SourceLocation_Column_Set(handle CGoHandle, val C.longlong) {
-	op := ptrFromHandle_api_SourceLocation(handle)
-	op.Column = int(val)
+//export api_ExecutionResult_Output_Set
+func api_ExecutionResult_Output_Set(handle CGoHandle, val *C.char) {
+	op := ptrFromHandle_api_ExecutionResult(handle)
+	op.Output = C.GoString(val)
 }
 
-// --- wrapping struct: api.UnknownFunctionHandler ---
+// --- wrapping struct: api.VM ---
 //
-//export api_UnknownFunctionHandler_CTor
-func api_UnknownFunctionHandler_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_UnknownFunctionHandler(&api.UnknownFunctionHandler{}))
+//export api_VM_CTor
+func api_VM_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_VM(&api.VM{}))
 }
 
-// --- wrapping struct: api.VMCompatibilityShim ---
-//
-//export api_VMCompatibilityShim_CTor
-func api_VMCompatibilityShim_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_VMCompatibilityShim(&api.VMCompatibilityShim{}))
+//export api_VM_GetCompatibilityShim
+func api_VM_GetCompatibilityShim(_handle CGoHandle) CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	if __err != nil {
+		return handleFromPtr_Ptr_api_VMCompatibilityShim(nil)
+	}
+	return handleFromPtr_Ptr_api_VMCompatibilityShim(gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).GetCompatibilityShim())
+
 }
 
-//export api_VMCompatibilityShim_DefineFunction
-func api_VMCompatibilityShim_DefineFunction(_handle CGoHandle, id *C.char, name *C.char, argc C.longlong, function *C.PyObject) *C.char {
-	_fun_arg := function
+//export api_VM_Execute
+func api_VM_Execute(_handle CGoHandle, code *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return errorGoToPy(nil)
+		return handleFromPtr_Ptr_api_ExecutionResult(nil)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).DefineFunction(C.GoString(id), C.GoString(name), int(argc), func(id string, jsonArgs string) string {
-		if C.PyCallable_Check(_fun_arg) == 0 {
-			return C.GoString(nil)
-		}
-		_gstate := C.PyGILState_Ensure()
-		_fcargs := C.PyTuple_New(2)
-		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
-		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
-		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
-		C.gopy_decref(_fcargs)
-		C.gopy_err_handle()
-		C.PyGILState_Release(_gstate)
-		return C.GoString(C.PyBytes_AsString(_fcret))
-	})
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).Execute(C.GoString(code))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		return estr
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Ptr_api_ExecutionResult(nil)
 	}
-	return C.CString("")
+	return handleFromPtr_Ptr_api_ExecutionResult(cret)
 }
 
-//export api_VMCompatibilityShim_BuildNewClassVariableWithGetter
-func api_VMCompatibilityShim_BuildNewClassVariableWithGetter(_handle CGoHandle, variable CGoHandle, getterID *C.char, getter *C.PyObject) CGoHandle {
-	_fun_arg := getter
+//export api_VM_ExecuteWithContext
+func api_VM_ExecuteWithContext(_handle CGoHandle, ctx CGoHandle, code *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_Ptr_api_ClassVariable(nil)
+		return handleFromPtr_Ptr_api_ExecutionResult(nil)
 	}
-	return handleFromPtr_Ptr_api_ClassVariable(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassVariableWithGetter(ptrFromHandle_Ptr_api_ClassVariable(variable), C.GoString(getterID), func(id string, jsonArgs string) string {
-		if C.PyCallable_Check(_fun_arg) == 0 {
-			return C.GoString(nil)
-		}
-		_gstate := C.PyGILState_Ensure()
-		_fcargs := C.PyTuple_New(2)
-		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
-		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
-		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
-		C.gopy_decref(_fcargs)
-		C.gopy_err_handle()
-		C.PyGILState_Release(_gstate)
-		return C.GoString(C.PyBytes_AsString(_fcret))
-	}))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).ExecuteWithContext(ptrFromHandle_context_Context(ctx), C.GoString(code))
 
+	C.PyEval_RestoreThread(_saved_thread)
+	if __err != nil {
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Ptr_api_ExecutionResult(nil)
+	}
+	return handleFromPtr_Ptr_api_ExecutionResult(cret)
 }
 
-//export api_VMCompatibilityShim_BuildNewClassVariableWithSetter
-func api_VMCompatibilityShim_BuildNewClassVariableWithSetter(_handle CGoHandle, variable CGoHandle, setterID *C.char, setter *C.PyObject) CGoHandle {
-	_fun_arg := setter
+//export api_VM_NewObjectInstance
+func api_VM_NewObjectInstance(_handle CGoHandle, className *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_Ptr_api_ClassVariable(nil)
+		return handleFromPtr_api_GoValue(nil)
 	}
-	return handleFromPtr_Ptr_api_ClassVariable(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassVariableWithSetter(ptrFromHandle_Ptr_api_ClassVariable(variable), C.GoString(setterID), func(id string, jsonArgs string) string {
-		if C.PyCallable_Check(_fun_arg) == 0 {
-			return C.GoString(nil)
-		}
-		_gstate := C.PyGILState_Ensure()
-		_fcargs := C.PyTuple_New(2)
-		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
-		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
-		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
-		C.gopy_decref(_fcargs)
-		C.gopy_err_handle()
-		C.PyGILState_Release(_gstate)
-		return C.GoString(C.PyBytes_AsString(_fcret))
-	}))
-
-}
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).NewObjectInstance(C.GoString(className))
 
-//export api_VMCompatibilityShim_BuildNewClassMethod
-func api_VMCompatibilityShim_BuildNewClassMethod(_handle CGoHandle, method CGoHandle, id *C.char, function *C.PyObject) CGoHandle {
-	_fun_arg := function
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
-		return handleFromPtr_Ptr_api_ClassMethod(nil)
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_api_GoValue(nil)
 	}
-	return handleFromPtr_Ptr_api_ClassMethod(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassMethod(ptrFromHandle_Ptr_api_ClassMethod(method), C.GoString(id), func(id string, jsonArgs string) string {
-		if C.PyCallable_Check(_fun_arg) == 0 {
-			return C.GoString(nil)
-		}
-		_gstate := C.PyGILState_Ensure()
-		_fcargs := C.PyTuple_New(2)
-		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
-		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
-		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
-		C.gopy_decref(_fcargs)
-		C.gopy_err_handle()
-		C.PyGILState_Release(_gstate)
-		return C.GoString(C.PyBytes_AsString(_fcret))
-	}))
-
+	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_VMCompatibilityShim_BuildNewUnknownFunctionHandler
-func api_VMCompatibilityShim_BuildNewUnknownFunctionHandler(_handle CGoHandle, id *C.char, function *C.PyObject) CGoHandle {
-	_fun_arg := function
+//export api_VM_Call
+func api_VM_Call(_handle CGoHandle, functionName *C.char, args CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_api_UnknownFunctionHandler(nil)
+		return handleFromPtr_api_GoValue(nil)
 	}
-	cret := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewUnknownFunctionHandler(C.GoString(id), func(id string, jsonArgs string) string {
-		if C.PyCallable_Check(_fun_arg) == 0 {
-			return C.GoString(nil)
-		}
-		_gstate := C.PyGILState_Ensure()
-		_fcargs := C.PyTuple_New(2)
-		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
-		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
-		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
-		C.gopy_decref(_fcargs)
-		C.gopy_err_handle()
-		C.PyGILState_Release(_gstate)
-		return C.GoString(C.PyBytes_AsString(_fcret))
-	})
-
-	return handleFromPtr_api_UnknownFunctionHandler(&cret)
-}
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).Call(C.GoString(functionName), deptrFromHandle_Slice_api_GoValue(args))
 
-//export api_VMCompatibilityShim_IsClassDefined
-func api_VMCompatibilityShim_IsClassDefined(_handle CGoHandle, name *C.char) C.char {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
-		return boolGoToPy(false)
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_api_GoValue(nil)
 	}
-	return boolGoToPy(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).IsClassDefined(C.GoString(name)))
-
+	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_VMCompatibilityShim_LookupObject
-func api_VMCompatibilityShim_LookupObject(_handle CGoHandle, id *C.char) CGoHandle {
+//export api_VM_CallMethod
+func api_VM_CallMethod(_handle CGoHandle, object CGoHandle, methodName *C.char, args CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
 		return handleFromPtr_api_GoValue(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).LookupObject(C.GoString(id))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).CallMethod(*ptrFromHandle_api_GoValue(object), C.GoString(methodName), deptrFromHandle_Slice_api_GoValue(args))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
@@ -2571,71 +2594,69 @@ func api_VMCompatibilityShim_LookupObject(_handle CGoHandle, id *C.char) CGoHand
 	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_VMCompatibilityShim_GetObjectMRO
-func api_VMCompatibilityShim_GetObjectMRO(_handle CGoHandle, id *C.char) CGoHandle {
+//export api_VM_DefineVariable
+func api_VM_DefineVariable(_handle CGoHandle, name *C.char, value CGoHandle, constant C.char) *C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_Slice_string(nil)
+		return errorGoToPy(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectMRO(C.GoString(id))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).DefineVariable(C.GoString(name), *ptrFromHandle_api_GoValue(value), boolPyToGo(constant))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Slice_string(nil)
+		return estr
 	}
-	return handleFromPtr_Slice_string(&cret)
+	return C.CString("")
 }
 
-//export api_VMCompatibilityShim_GetObjectImmediateFunctions
-func api_VMCompatibilityShim_GetObjectImmediateFunctions(_handle CGoHandle, id *C.char) CGoHandle {
+//export api_VM_SetVariable
+func api_VM_SetVariable(_handle CGoHandle, variableName *C.char, value CGoHandle) *C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_Slice_string(nil)
+		return errorGoToPy(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectImmediateFunctions(C.GoString(id))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).SetVariable(C.GoString(variableName), *ptrFromHandle_api_GoValue(value))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Slice_string(nil)
+		return estr
 	}
-	return handleFromPtr_Slice_string(&cret)
+	return C.CString("")
 }
 
-//export api_VMCompatibilityShim_GetObjectImmediateVariables
-func api_VMCompatibilityShim_GetObjectImmediateVariables(_handle CGoHandle, id *C.char) CGoHandle {
+//export api_VM_GetVariable
+func api_VM_GetVariable(_handle CGoHandle, variableName *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
-		return handleFromPtr_Slice_string(nil)
+		return handleFromPtr_api_GoValue(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectImmediateVariables(C.GoString(id))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).GetVariable(C.GoString(variableName))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
 		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Slice_string(nil)
+		return handleFromPtr_api_GoValue(nil)
 	}
-	return handleFromPtr_Slice_string(&cret)
+	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_VMCompatibilityShim_AddVariableToObject
-func api_VMCompatibilityShim_AddVariableToObject(_handle CGoHandle, id *C.char, variable CGoHandle) *C.char {
+//export api_VM_DefineClass
+func api_VM_DefineClass(_handle CGoHandle, classDef CGoHandle) *C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
 	if __err != nil {
 		return errorGoToPy(nil)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).AddVariableToObject(C.GoString(id), ptrFromHandle_Ptr_api_ClassVariable(variable))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).DefineClass(ptrFromHandle_Ptr_api_ClassDefinition(classDef))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
@@ -2646,266 +2667,102 @@ func api_VMCompatibilityShim_AddVariableToObject(_handle CGoHandle, id *C.char,
 	return C.CString("")
 }
 
-// --- wrapping struct: api.VMConfig ---
+// --- wrapping struct: api.GoValue ---
 //
-//export api_VMConfig_CTor
-func api_VMConfig_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_VMConfig(&api.VMConfig{}))
+//export api_GoValue_CTor
+func api_GoValue_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_GoValue(&api.GoValue{}))
 }
 
-//export api_VMConfig_Stdout_Get
-func api_VMConfig_Stdout_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_VMConfig(handle)
-	return handleFromPtr_io_Writer(op.Stdout)
-}
+//export api_GoValue_ID
+func api_GoValue_ID(_handle CGoHandle) *C.char {
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
+	if __err != nil {
+		return C.CString("")
+	}
+	return C.CString(gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).ID())
 
-//export api_VMConfig_Stdout_Set
-func api_VMConfig_Stdout_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_VMConfig(handle)
-	op.Stdout = ptrFromHandle_io_Writer(val)
 }
 
-//export api_VMConfig_Stdin_Get
-func api_VMConfig_Stdin_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_VMConfig(handle)
-	return handleFromPtr_io_Reader(op.Stdin)
-}
+//export api_GoValue_MarshalJSON
+func api_GoValue_MarshalJSON(_handle CGoHandle) CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
+	if __err != nil {
+		return handleFromPtr_Slice_byte(nil)
+	}
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).MarshalJSON()
 
-//export api_VMConfig_Stdin_Set
-func api_VMConfig_Stdin_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_VMConfig(handle)
-	op.Stdin = ptrFromHandle_io_Reader(val)
+	C.PyEval_RestoreThread(_saved_thread)
+	if __err != nil {
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Slice_byte(nil)
+	}
+	return handleFromPtr_Slice_byte(&cret)
 }
 
-//export api_VMConfig_Timeout_Get
-func api_VMConfig_Timeout_Get(handle CGoHandle) C.longlong {
-	op := ptrFromHandle_api_VMConfig(handle)
-	return C.longlong(int64(op.Timeout))
-}
+//export api_GoValue_Type
+func api_GoValue_Type(_handle CGoHandle) *C.char {
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
+	if __err != nil {
+		return C.CString("")
+	}
+	return C.CString(gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Type())
 
-//export api_VMConfig_Timeout_Set
-func api_VMConfig_Timeout_Set(handle CGoHandle, val C.longlong) {
-	op := ptrFromHandle_api_VMConfig(handle)
-	op.Timeout = time.Duration(int64(val))
 }
 
-//export api_VMConfig_WorkingDirectory_Get
-func api_VMConfig_WorkingDirectory_Get(handle CGoHandle) *C.char {
-	op := ptrFromHandle_api_VMConfig(handle)
-	return C.CString(op.WorkingDirectory)
-}
+//export api_GoValue_Int
+func api_GoValue_Int(_handle CGoHandle) C.longlong {
+	_saved_thread := C.PyEval_SaveThread()
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
+	if __err != nil {
+		return C.longlong(0)
+	}
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Int()
 
-//export api_VMConfig_WorkingDirectory_Set
-func api_VMConfig_WorkingDirectory_Set(handle CGoHandle, val *C.char) {
-	op := ptrFromHandle_api_VMConfig(handle)
-	op.WorkingDirectory = C.GoString(val)
+	C.PyEval_RestoreThread(_saved_thread)
+	if __err != nil {
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return C.longlong(0)
+	}
+	return C.longlong(cret)
 }
 
-//export api_VMConfig_Validate
-func api_VMConfig_Validate(_handle CGoHandle) *C.char {
+//export api_GoValue_Float
+func api_GoValue_Float(_handle CGoHandle) C.double {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMConfig")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
 	if __err != nil {
-		return errorGoToPy(nil)
+		return C.double(0)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMConfig{})).(*api.VMConfig).Validate()
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Float()
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		return estr
+		C.free(unsafe.Pointer(estr))
+		return C.double(0)
 	}
-	return C.CString("")
+	return C.double(cret)
 }
 
-// --- wrapping struct: api.ClassDefinition ---
-//
-//export api_ClassDefinition_CTor
-func api_ClassDefinition_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_ClassDefinition(&api.ClassDefinition{}))
-}
-
-//export api_ClassDefinition_Name_Get
-func api_ClassDefinition_Name_Get(handle CGoHandle) *C.char {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return C.CString(op.Name)
-}
-
-//export api_ClassDefinition_Name_Set
-func api_ClassDefinition_Name_Set(handle CGoHandle, val *C.char) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.Name = C.GoString(val)
-}
-
-//export api_ClassDefinition_PublicVariables_Get
-func api_ClassDefinition_PublicVariables_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.PublicVariables)
-}
-
-//export api_ClassDefinition_PublicVariables_Set
-func api_ClassDefinition_PublicVariables_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.PublicVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
-}
-
-//export api_ClassDefinition_PrivateVariables_Get
-func api_ClassDefinition_PrivateVariables_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.PrivateVariables)
-}
-
-//export api_ClassDefinition_PrivateVariables_Set
-func api_ClassDefinition_PrivateVariables_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.PrivateVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
-}
-
-//export api_ClassDefinition_SharedVariables_Get
-func api_ClassDefinition_SharedVariables_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Map_string_Ptr_api_ClassVariable(&op.SharedVariables)
-}
-
-//export api_ClassDefinition_SharedVariables_Set
-func api_ClassDefinition_SharedVariables_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.SharedVariables = deptrFromHandle_Map_string_Ptr_api_ClassVariable(val)
-}
-
-//export api_ClassDefinition_PublicMethods_Get
-func api_ClassDefinition_PublicMethods_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Map_string_Ptr_api_ClassMethod(&op.PublicMethods)
-}
-
-//export api_ClassDefinition_PublicMethods_Set
-func api_ClassDefinition_PublicMethods_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.PublicMethods = deptrFromHandle_Map_string_Ptr_api_ClassMethod(val)
-}
-
-//export api_ClassDefinition_PrivateMethods_Get
-func api_ClassDefinition_PrivateMethods_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Map_string_Ptr_api_ClassMethod(&op.PrivateMethods)
-}
-
-//export api_ClassDefinition_PrivateMethods_Set
-func api_ClassDefinition_PrivateMethods_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.PrivateMethods = deptrFromHandle_Map_string_Ptr_api_ClassMethod(val)
-}
-
-//export api_ClassDefinition_UnknownFunctionHandler_Get
-func api_ClassDefinition_UnknownFunctionHandler_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	return handleFromPtr_Ptr_api_UnknownFunctionHandler(op.UnknownFunctionHandler)
-}
-
-//export api_ClassDefinition_UnknownFunctionHandler_Set
-func api_ClassDefinition_UnknownFunctionHandler_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ClassDefinition(handle)
-	op.UnknownFunctionHandler = ptrFromHandle_Ptr_api_UnknownFunctionHandler(val)
-}
-
-// --- wrapping struct: api.GoValue ---
-//
-//export api_GoValue_CTor
-func api_GoValue_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_GoValue(&api.GoValue{}))
-}
-
-//export api_GoValue_ID
-func api_GoValue_ID(_handle CGoHandle) *C.char {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return C.CString("")
-	}
-	return C.CString(gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).ID())
-
-}
-
-//export api_GoValue_MarshalJSON
-func api_GoValue_MarshalJSON(_handle CGoHandle) CGoHandle {
-	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return handleFromPtr_Slice_byte(nil)
-	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).MarshalJSON()
-
-	C.PyEval_RestoreThread(_saved_thread)
-	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Slice_byte(nil)
-	}
-	return handleFromPtr_Slice_byte(&cret)
-}
-
-//export api_GoValue_Type
-func api_GoValue_Type(_handle CGoHandle) *C.char {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return C.CString("")
-	}
-	return C.CString(gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Type())
-
-}
-
-//export api_GoValue_Int
-func api_GoValue_Int(_handle CGoHandle) C.longlong {
-	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return C.longlong(0)
-	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Int()
-
-	C.PyEval_RestoreThread(_saved_thread)
-	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return C.longlong(0)
-	}
-	return C.longlong(cret)
-}
-
-//export api_GoValue_Float
-func api_GoValue_Float(_handle CGoHandle) C.double {
-	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return C.double(0)
-	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).Float()
-
-	C.PyEval_RestoreThread(_saved_thread)
-	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return C.double(0)
-	}
-	return C.double(cret)
-}
-
-//export api_GoValue_String
-func api_GoValue_String(_handle CGoHandle) *C.char {
-	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
-	if __err != nil {
-		return C.CString("")
-	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).String()
+//export api_GoValue_String
+func api_GoValue_String(_handle CGoHandle) *C.char {
+	_saved_thread := C.PyEval_SaveThread()
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.GoValue")
+	if __err != nil {
+		return C.CString("")
+	}
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.GoValue{})).(*api.GoValue).String()
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
@@ -2993,90 +2850,220 @@ func api_GoValue_Object(_handle CGoHandle) CGoHandle {
 	return handleFromPtr_Ptr_environment_ObjectInstance(cret)
 }
 
-// --- wrapping struct: api.VM ---
+// --- wrapping struct: api.SourceLocation ---
 //
-//export api_VM_CTor
-func api_VM_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_VM(&api.VM{}))
+//export api_SourceLocation_CTor
+func api_SourceLocation_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_SourceLocation(&api.SourceLocation{}))
 }
 
-//export api_VM_GetCompatibilityShim
-func api_VM_GetCompatibilityShim(_handle CGoHandle) CGoHandle {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
-	if __err != nil {
-		return handleFromPtr_Ptr_api_VMCompatibilityShim(nil)
-	}
-	return handleFromPtr_Ptr_api_VMCompatibilityShim(gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).GetCompatibilityShim())
+//export api_SourceLocation_Filename_Get
+func api_SourceLocation_Filename_Get(handle CGoHandle) *C.char {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	return C.CString(op.Filename)
+}
 
+//export api_SourceLocation_Filename_Set
+func api_SourceLocation_Filename_Set(handle CGoHandle, val *C.char) {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	op.Filename = C.GoString(val)
 }
 
-//export api_VM_Execute
-func api_VM_Execute(_handle CGoHandle, code *C.char) CGoHandle {
+//export api_SourceLocation_Line_Get
+func api_SourceLocation_Line_Get(handle CGoHandle) C.longlong {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	return C.longlong(op.Line)
+}
+
+//export api_SourceLocation_Line_Set
+func api_SourceLocation_Line_Set(handle CGoHandle, val C.longlong) {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	op.Line = int(val)
+}
+
+//export api_SourceLocation_Column_Get
+func api_SourceLocation_Column_Get(handle CGoHandle) C.longlong {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	return C.longlong(op.Column)
+}
+
+//export api_SourceLocation_Column_Set
+func api_SourceLocation_Column_Set(handle CGoHandle, val C.longlong) {
+	op := ptrFromHandle_api_SourceLocation(handle)
+	op.Column = int(val)
+}
+
+// --- wrapping struct: api.UnknownFunctionHandler ---
+//
+//export api_UnknownFunctionHandler_CTor
+func api_UnknownFunctionHandler_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_UnknownFunctionHandler(&api.UnknownFunctionHandler{}))
+}
+
+// --- wrapping struct: api.VMCompatibilityShim ---
+//
+//export api_VMCompatibilityShim_CTor
+func api_VMCompatibilityShim_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_VMCompatibilityShim(&api.VMCompatibilityShim{}))
+}
+
+//export api_VMCompatibilityShim_DefineFunction
+func api_VMCompatibilityShim_DefineFunction(_handle CGoHandle, id *C.char, name *C.char, argc C.longlong, function *C.PyObject) *C.char {
+	_fun_arg := function
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return handleFromPtr_Ptr_api_ExecutionResult(nil)
+		return errorGoToPy(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).Execute(C.GoString(code))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).DefineFunction(C.GoString(id), C.GoString(name), int(argc), func(id string, jsonArgs string) string {
+		if C.PyCallable_Check(_fun_arg) == 0 {
+			return C.GoString(nil)
+		}
+		_gstate := C.PyGILState_Ensure()
+		_fcargs := C.PyTuple_New(2)
+		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
+		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
+		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
+		C.gopy_decref(_fcargs)
+		C.gopy_err_handle()
+		C.PyGILState_Release(_gstate)
+		return C.GoString(C.PyBytes_AsString(_fcret))
+	})
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Ptr_api_ExecutionResult(nil)
+		return estr
 	}
-	return handleFromPtr_Ptr_api_ExecutionResult(cret)
+	return C.CString("")
 }
 
-//export api_VM_ExecuteWithContext
-func api_VM_ExecuteWithContext(_handle CGoHandle, ctx CGoHandle, code *C.char) CGoHandle {
+//export api_VMCompatibilityShim_BuildNewClassVariableWithGetter
+func api_VMCompatibilityShim_BuildNewClassVariableWithGetter(_handle CGoHandle, variable CGoHandle, getterID *C.char, getter *C.PyObject) CGoHandle {
+	_fun_arg := getter
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return handleFromPtr_Ptr_api_ExecutionResult(nil)
+		return handleFromPtr_Ptr_api_ClassVariable(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).ExecuteWithContext(ptrFromHandle_context_Context(ctx), C.GoString(code))
+	return handleFromPtr_Ptr_api_ClassVariable(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassVariableWithGetter(ptrFromHandle_Ptr_api_ClassVariable(variable), C.GoString(getterID), func(id string, jsonArgs string) string {
+		if C.PyCallable_Check(_fun_arg) == 0 {
+			return C.GoString(nil)
+		}
+		_gstate := C.PyGILState_Ensure()
+		_fcargs := C.PyTuple_New(2)
+		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
+		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
+		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
+		C.gopy_decref(_fcargs)
+		C.gopy_err_handle()
+		C.PyGILState_Release(_gstate)
+		return C.GoString(C.PyBytes_AsString(_fcret))
+	}))
 
-	C.PyEval_RestoreThread(_saved_thread)
+}
+
+//export api_VMCompatibilityShim_BuildNewClassVariableWithSetter
+func api_VMCompatibilityShim_BuildNewClassVariableWithSetter(_handle CGoHandle, variable CGoHandle, setterID *C.char, setter *C.PyObject) CGoHandle {
+	_fun_arg := setter
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Ptr_api_ExecutionResult(nil)
+		return handleFromPtr_Ptr_api_ClassVariable(nil)
 	}
-	return handleFromPtr_Ptr_api_ExecutionResult(cret)
+	return handleFromPtr_Ptr_api_ClassVariable(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassVariableWithSetter(ptrFromHandle_Ptr_api_ClassVariable(variable), C.GoString(setterID), func(id string, jsonArgs string) string {
+		if C.PyCallable_Check(_fun_arg) == 0 {
+			return C.GoString(nil)
+		}
+		_gstate := C.PyGILState_Ensure()
+		_fcargs := C.PyTuple_New(2)
+		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
+		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
+		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
+		C.gopy_decref(_fcargs)
+		C.gopy_err_handle()
+		C.PyGILState_Release(_gstate)
+		return C.GoString(C.PyBytes_AsString(_fcret))
+	}))
+
 }
 
-//export api_VM_NewObjectInstance
-func api_VM_NewObjectInstance(_handle CGoHandle, className *C.char) CGoHandle {
+//export api_VMCompatibilityShim_BuildNewClassMethod
+func api_VMCompatibilityShim_BuildNewClassMethod(_handle CGoHandle, method CGoHandle, id *C.char, function *C.PyObject) CGoHandle {
+	_fun_arg := function
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return handleFromPtr_api_GoValue(nil)
+		return handleFromPtr_Ptr_api_ClassMethod(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).NewObjectInstance(C.GoString(className))
+	return handleFromPtr_Ptr_api_ClassMethod(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewClassMethod(ptrFromHandle_Ptr_api_ClassMethod(method), C.GoString(id), func(id string, jsonArgs string) string {
+		if C.PyCallable_Check(_fun_arg) == 0 {
+			return C.GoString(nil)
+		}
+		_gstate := C.PyGILState_Ensure()
+		_fcargs := C.PyTuple_New(2)
+		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
+		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
+		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
+		C.gopy_decref(_fcargs)
+		C.gopy_err_handle()
+		C.PyGILState_Release(_gstate)
+		return C.GoString(C.PyBytes_AsString(_fcret))
+	}))
 
-	C.PyEval_RestoreThread(_saved_thread)
+}
+
+//export api_VMCompatibilityShim_BuildNewUnknownFunctionHandler
+func api_VMCompatibilityShim_BuildNewUnknownFunctionHandler(_handle CGoHandle, id *C.char, function *C.PyObject) CGoHandle {
+	_fun_arg := function
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_api_GoValue(nil)
+		return handleFromPtr_api_UnknownFunctionHandler(nil)
 	}
-	return handleFromPtr_api_GoValue(&cret)
+	cret := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).BuildNewUnknownFunctionHandler(C.GoString(id), func(id string, jsonArgs string) string {
+		if C.PyCallable_Check(_fun_arg) == 0 {
+			return C.GoString(nil)
+		}
+		_gstate := C.PyGILState_Ensure()
+		_fcargs := C.PyTuple_New(2)
+		C.PyTuple_SetItem(_fcargs, 0, C.gopy_build_string(C.CString(id)))
+		C.PyTuple_SetItem(_fcargs, 1, C.gopy_build_string(C.CString(jsonArgs)))
+		_fcret := C.PyObject_CallObject(_fun_arg, _fcargs)
+		C.gopy_decref(_fcargs)
+		C.gopy_err_handle()
+		C.PyGILState_Release(_gstate)
+		return C.GoString(C.PyBytes_AsString(_fcret))
+	})
+
+	return handleFromPtr_api_UnknownFunctionHandler(&cret)
 }
 
-//export api_VM_Call
-func api_VM_Call(_handle CGoHandle, functionName *C.char, args CGoHandle) CGoHandle {
+//export api_VMCompatibilityShim_IsClassDefined
+func api_VMCompatibilityShim_IsClassDefined(_handle CGoHandle, name *C.char) C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	defer C.PyEval_RestoreThread(_saved_thread)
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
+	if __err != nil {
+		return boolGoToPy(false)
+	}
+	return boolGoToPy(gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).IsClassDefined(C.GoString(name)))
+
+}
+
+//export api_VMCompatibilityShim_LookupObject
+func api_VMCompatibilityShim_LookupObject(_handle CGoHandle, id *C.char) CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
 		return handleFromPtr_api_GoValue(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).Call(C.GoString(functionName), deptrFromHandle_Slice_api_GoValue(args))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).LookupObject(C.GoString(id))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
@@ -3088,88 +3075,144 @@ func api_VM_Call(_handle CGoHandle, functionName *C.char, args CGoHandle) CGoHan
 	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_VM_CallMethod
-func api_VM_CallMethod(_handle CGoHandle, object CGoHandle, methodName *C.char, args CGoHandle) CGoHandle {
+//export api_VMCompatibilityShim_GetObjectMRO
+func api_VMCompatibilityShim_GetObjectMRO(_handle CGoHandle, id *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return handleFromPtr_api_GoValue(nil)
+		return handleFromPtr_Slice_string(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).CallMethod(*ptrFromHandle_api_GoValue(object), C.GoString(methodName), deptrFromHandle_Slice_api_GoValue(args))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectMRO(C.GoString(id))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
 		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_api_GoValue(nil)
+		return handleFromPtr_Slice_string(nil)
 	}
-	return handleFromPtr_api_GoValue(&cret)
+	return handleFromPtr_Slice_string(&cret)
 }
 
-//export api_VM_DefineVariable
-func api_VM_DefineVariable(_handle CGoHandle, name *C.char, value CGoHandle, constant C.char) *C.char {
+//export api_VMCompatibilityShim_GetObjectImmediateFunctions
+func api_VMCompatibilityShim_GetObjectImmediateFunctions(_handle CGoHandle, id *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return errorGoToPy(nil)
+		return handleFromPtr_Slice_string(nil)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).DefineVariable(C.GoString(name), *ptrFromHandle_api_GoValue(value), boolPyToGo(constant))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectImmediateFunctions(C.GoString(id))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		return estr
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Slice_string(nil)
 	}
-	return C.CString("")
+	return handleFromPtr_Slice_string(&cret)
 }
 
-//export api_VM_SetVariable
-func api_VM_SetVariable(_handle CGoHandle, variableName *C.char, value CGoHandle) *C.char {
+//export api_VMCompatibilityShim_GetObjectImmediateVariables
+func api_VMCompatibilityShim_GetObjectImmediateVariables(_handle CGoHandle, id *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return errorGoToPy(nil)
+		return handleFromPtr_Slice_string(nil)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).SetVariable(C.GoString(variableName), *ptrFromHandle_api_GoValue(value))
+	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).GetObjectImmediateVariables(C.GoString(id))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		return estr
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Slice_string(nil)
 	}
-	return C.CString("")
+	return handleFromPtr_Slice_string(&cret)
 }
 
-//export api_VM_GetVariable
-func api_VM_GetVariable(_handle CGoHandle, variableName *C.char) CGoHandle {
+//export api_VMCompatibilityShim_AddVariableToObject
+func api_VMCompatibilityShim_AddVariableToObject(_handle CGoHandle, id *C.char, variable CGoHandle) *C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMCompatibilityShim")
 	if __err != nil {
-		return handleFromPtr_api_GoValue(nil)
+		return errorGoToPy(nil)
 	}
-	cret, __err := gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).GetVariable(C.GoString(variableName))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMCompatibilityShim{})).(*api.VMCompatibilityShim).AddVariableToObject(C.GoString(id), ptrFromHandle_Ptr_api_ClassVariable(variable))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_api_GoValue(nil)
+		return estr
 	}
-	return handleFromPtr_api_GoValue(&cret)
+	return C.CString("")
 }
 
-//export api_VM_DefineClass
-func api_VM_DefineClass(_handle CGoHandle, classDef CGoHandle) *C.char {
+// --- wrapping struct: api.VMConfig ---
+//
+//export api_VMConfig_CTor
+func api_VMConfig_CTor() CGoHandle {
+	return CGoHandle(handleFromPtr_api_VMConfig(&api.VMConfig{}))
+}
+
+//export api_VMConfig_Stdout_Get
+func api_VMConfig_Stdout_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_VMConfig(handle)
+	return handleFromPtr_io_Writer(op.Stdout)
+}
+
+//export api_VMConfig_Stdout_Set
+func api_VMConfig_Stdout_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_VMConfig(handle)
+	op.Stdout = ptrFromHandle_io_Writer(val)
+}
+
+//export api_VMConfig_Stdin_Get
+func api_VMConfig_Stdin_Get(handle CGoHandle) CGoHandle {
+	op := ptrFromHandle_api_VMConfig(handle)
+	return handleFromPtr_io_Reader(op.Stdin)
+}
+
+//export api_VMConfig_Stdin_Set
+func api_VMConfig_Stdin_Set(handle CGoHandle, val CGoHandle) {
+	op := ptrFromHandle_api_VMConfig(handle)
+	op.Stdin = ptrFromHandle_io_Reader(val)
+}
+
+//export api_VMConfig_Timeout_Get
+func api_VMConfig_Timeout_Get(handle CGoHandle) C.longlong {
+	op := ptrFromHandle_api_VMConfig(handle)
+	return C.longlong(int64(op.Timeout))
+}
+
+//export api_VMConfig_Timeout_Set
+func api_VMConfig_Timeout_Set(handle CGoHandle, val C.longlong) {
+	op := ptrFromHandle_api_VMConfig(handle)
+	op.Timeout = time.Duration(int64(val))
+}
+
+//export api_VMConfig_WorkingDirectory_Get
+func api_VMConfig_WorkingDirectory_Get(handle CGoHandle) *C.char {
+	op := ptrFromHandle_api_VMConfig(handle)
+	return C.CString(op.WorkingDirectory)
+}
+
+//export api_VMConfig_WorkingDirectory_Set
+func api_VMConfig_WorkingDirectory_Set(handle CGoHandle, val *C.char) {
+	op := ptrFromHandle_api_VMConfig(handle)
+	op.WorkingDirectory = C.GoString(val)
+}
+
+//export api_VMConfig_Validate
+func api_VMConfig_Validate(_handle CGoHandle) *C.char {
 	_saved_thread := C.PyEval_SaveThread()
-	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VM")
+	vifc, __err := gopyh.VarFromHandleTry((gopyh.CGoHandle)(_handle), "*api.VMConfig")
 	if __err != nil {
 		return errorGoToPy(nil)
 	}
-	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VM{})).(*api.VM).DefineClass(ptrFromHandle_Ptr_api_ClassDefinition(classDef))
+	__err = gopyh.Embed(vifc, reflect.TypeOf(api.VMConfig{})).(*api.VMConfig).Validate()
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
@@ -3325,76 +3368,67 @@ func api_VMError_IsConfigError(_handle CGoHandle) C.char {
 
 }
 
-// --- wrapping struct: api.ExecutionResult ---
-//
-//export api_ExecutionResult_CTor
-func api_ExecutionResult_CTor() CGoHandle {
-	return CGoHandle(handleFromPtr_api_ExecutionResult(&api.ExecutionResult{}))
-}
+// ---- Slices ---
 
-//export api_ExecutionResult_Value_Get
-func api_ExecutionResult_Value_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	return handleFromPtr_api_GoValue(&op.Value)
-}
+// ---- Maps ---
 
-//export api_ExecutionResult_Value_Set
-func api_ExecutionResult_Value_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	op.Value = *ptrFromHandle_api_GoValue(val)
-}
+// ---- Constructors ---
 
-//export api_ExecutionResult_RawValue_Get
-func api_ExecutionResult_RawValue_Get(handle CGoHandle) CGoHandle {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	return handleFromPtr_environment_Value(op.RawValue)
-}
+//export api_NewClassDefinition
+func api_NewClassDefinition() CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	return handleFromPtr_Ptr_api_ClassDefinition(api.NewClassDefinition())
 
-//export api_ExecutionResult_RawValue_Set
-func api_ExecutionResult_RawValue_Set(handle CGoHandle, val CGoHandle) {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	op.RawValue = ptrFromHandle_environment_Value(val)
 }
 
-//export api_ExecutionResult_Output_Get
-func api_ExecutionResult_Output_Get(handle CGoHandle) *C.char {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	return C.CString(op.Output)
-}
+//export api_NewVM
+func api_NewVM(config CGoHandle) CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	cret, __err := api.NewVM(ptrFromHandle_Ptr_api_VMConfig(config))
 
-//export api_ExecutionResult_Output_Set
-func api_ExecutionResult_Output_Set(handle CGoHandle, val *C.char) {
-	op := ptrFromHandle_api_ExecutionResult(handle)
-	op.Output = C.GoString(val)
+	C.PyEval_RestoreThread(_saved_thread)
+	if __err != nil {
+		estr := C.CString(__err.Error())
+		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
+		C.free(unsafe.Pointer(estr))
+		return handleFromPtr_Ptr_api_VM(nil)
+	}
+	return handleFromPtr_Ptr_api_VM(cret)
 }
 
-// ---- Slices ---
-
-// ---- Maps ---
+//export api_WrapInt
+func api_WrapInt(value C.longlong) CGoHandle {
+	_saved_thread := C.PyEval_SaveThread()
+	defer C.PyEval_RestoreThread(_saved_thread)
+	cret := api.WrapInt(int64(value))
 
-// ---- Constructors ---
+	return handleFromPtr_api_GoValue(&cret)
+}
 
-//export api_DefaultConfig
-func api_DefaultConfig() CGoHandle {
+//export api_WrapObject
+func api_WrapObject(value CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_VMConfig(api.DefaultConfig())
+	cret := api.WrapObject(ptrFromHandle_Ptr_environment_ObjectInstance(value))
 
+	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_NewClassDefinition
-func api_NewClassDefinition() CGoHandle {
+//export api_WrapAny
+func api_WrapAny(value *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_ClassDefinition(api.NewClassDefinition())
+	cret := api.WrapAny(C.GoString(value))
 
+	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_WrapObject
-func api_WrapObject(value CGoHandle) CGoHandle {
+//export api_WrapBool
+func api_WrapBool(value C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	cret := api.WrapObject(ptrFromHandle_Ptr_environment_ObjectInstance(value))
+	cret := api.WrapBool(boolPyToGo(value))
 
 	return handleFromPtr_api_GoValue(&cret)
 }
@@ -3414,15 +3448,6 @@ func api_ToGoValue(val CGoHandle) CGoHandle {
 	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_WrapBool
-func api_WrapBool(value C.char) CGoHandle {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	cret := api.WrapBool(boolPyToGo(value))
-
-	return handleFromPtr_api_GoValue(&cret)
-}
-
 //export api_WrapFloat
 func api_WrapFloat(value C.double) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
@@ -3441,60 +3466,43 @@ func api_WrapString(value *C.char) CGoHandle {
 	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_WrapInt
-func api_WrapInt(value C.longlong) CGoHandle {
+//export api_DefaultConfig
+func api_DefaultConfig() CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	cret := api.WrapInt(int64(value))
+	return handleFromPtr_Ptr_api_VMConfig(api.DefaultConfig())
 
-	return handleFromPtr_api_GoValue(&cret)
 }
 
-//export api_WrapAny
-func api_WrapAny(value *C.char) CGoHandle {
+//export api_NewCompileError
+func api_NewCompileError(message *C.char, source CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	cret := api.WrapAny(C.GoString(value))
-
-	return handleFromPtr_api_GoValue(&cret)
-}
-
-//export api_NewVM
-func api_NewVM(config CGoHandle) CGoHandle {
-	_saved_thread := C.PyEval_SaveThread()
-	cret, __err := api.NewVM(ptrFromHandle_Ptr_api_VMConfig(config))
+	return handleFromPtr_Ptr_api_VMError(api.NewCompileError(C.GoString(message), ptrFromHandle_Ptr_api_SourceLocation(source)))
 
-	C.PyEval_RestoreThread(_saved_thread)
-	if __err != nil {
-		estr := C.CString(__err.Error())
-		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
-		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Ptr_api_VM(nil)
-	}
-	return handleFromPtr_Ptr_api_VM(cret)
 }
 
-//export api_NewConversionError
-func api_NewConversionError(message *C.char, wrapped *C.char) CGoHandle {
+//export api_NewConfigError
+func api_NewConfigError(message *C.char, wrapped *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_VMError(api.NewConversionError(C.GoString(message), errors.New(C.GoString(wrapped))))
+	return handleFromPtr_Ptr_api_VMError(api.NewConfigError(C.GoString(message), errors.New(C.GoString(wrapped))))
 
 }
 
-//export api_NewCompileError
-func api_NewCompileError(message *C.char, source CGoHandle) CGoHandle {
+//export api_NewTimeoutError
+func api_NewTimeoutError(duration C.longlong) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_VMError(api.NewCompileError(C.GoString(message), ptrFromHandle_Ptr_api_SourceLocation(source)))
+	return handleFromPtr_Ptr_api_VMError(api.NewTimeoutError(time.Duration(int64(duration))))
 
 }
 
-//export api_NewConfigError
-func api_NewConfigError(message *C.char, wrapped *C.char) CGoHandle {
+//export api_NewConversionError
+func api_NewConversionError(message *C.char, wrapped *C.char) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
 	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_VMError(api.NewConfigError(C.GoString(message), errors.New(C.GoString(wrapped))))
+	return handleFromPtr_Ptr_api_VMError(api.NewConversionError(C.GoString(message), errors.New(C.GoString(wrapped))))
 
 }
 
@@ -3506,29 +3514,21 @@ func api_NewRuntimeError(message *C.char, source CGoHandle) CGoHandle {
 
 }
 
-//export api_NewTimeoutError
-func api_NewTimeoutError(duration C.longlong) CGoHandle {
-	_saved_thread := C.PyEval_SaveThread()
-	defer C.PyEval_RestoreThread(_saved_thread)
-	return handleFromPtr_Ptr_api_VMError(api.NewTimeoutError(time.Duration(int64(duration))))
-
-}
-
 // ---- Functions ---
 
-//export api_FromGoValue
-func api_FromGoValue(val CGoHandle) CGoHandle {
+//export api_ConvertArguments
+func api_ConvertArguments(args CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	cret, __err := api.FromGoValue(*ptrFromHandle_api_GoValue(val))
+	cret, __err := api.ConvertArguments(deptrFromHandle_Slice_api_GoValue(args))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
 		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_environment_Value(nil)
+		return handleFromPtr_Slice_environment_Value(nil)
 	}
-	return handleFromPtr_environment_Value(cret)
+	return handleFromPtr_Slice_environment_Value(&cret)
 }
 
 //export api_LookupObject
@@ -3546,17 +3546,17 @@ func api_LookupObject(id *C.char) CGoHandle {
 	return handleFromPtr_Ptr_environment_ObjectInstance(cret)
 }
 
-//export api_ConvertArguments
-func api_ConvertArguments(args CGoHandle) CGoHandle {
+//export api_FromGoValue
+func api_FromGoValue(val CGoHandle) CGoHandle {
 	_saved_thread := C.PyEval_SaveThread()
-	cret, __err := api.ConvertArguments(deptrFromHandle_Slice_api_GoValue(args))
+	cret, __err := api.FromGoValue(*ptrFromHandle_api_GoValue(val))
 
 	C.PyEval_RestoreThread(_saved_thread)
 	if __err != nil {
 		estr := C.CString(__err.Error())
 		C.PyErr_SetString(C.PyExc_RuntimeError, estr)
 		C.free(unsafe.Pointer(estr))
-		return handleFromPtr_Slice_environment_Value(nil)
+		return handleFromPtr_environment_Value(nil)
 	}
-	return handleFromPtr_Slice_environment_Value(&cret)
+	return handleFromPtr_environment_Value(cret)
 }