[[ LCB Machine ]] Add local variable names to module struct.

runrevmark · runrevmark · commit 7068a0426019 · 2015-01-28T09:59:58.000Z
Variable names are now encoded in the handler definition - this allows better error reporting. Ideally this information would be present in a sideline 'debug info' section, so this is a stop-gap.
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1223,14 +1223,16 @@ void MCScriptAddVariableToHandlerInModule(MCScriptModuleBuilderRef self, MCNameR
     MCScriptHandlerDefinition *t_handler;
     t_handler = static_cast<MCScriptHandlerDefinition *>(self -> module . definitions[self -> current_handler]);
     
-    if (!MCMemoryResizeArray(t_handler -> local_type_count + 1, t_handler -> local_types, t_handler -> local_type_count))
+    if (!MCMemoryResizeArray(t_handler -> local_type_count + 1, t_handler -> local_types, t_handler -> local_type_count) ||
+        !MCMemoryResizeArray(t_handler -> local_name_count + 1, t_handler -> local_names, t_handler -> local_name_count))
     {
         r_index = 0;
         self -> valid = false;
         return;
     }
 
     t_handler -> local_types[t_handler -> local_type_count - 1] = p_type;
+    t_handler -> local_names[t_handler -> local_name_count - 1] = MCValueRetain(p_name);
     
     r_index = self -> current_param_count + t_handler -> local_type_count - 1;
 }
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -129,6 +129,7 @@ MC_PICKLE_END_RECORD()
 MC_PICKLE_BEGIN_RECORD(MCScriptHandlerDefinition)
     MC_PICKLE_UINDEX(type)
     MC_PICKLE_ARRAY_OF_UINDEX(local_types, local_type_count)
+    MC_PICKLE_ARRAY_OF_NAMEREF(local_names, local_name_count)
     MC_PICKLE_UINDEX(start_address)
     MC_PICKLE_UINDEX(finish_address)
 MC_PICKLE_END_RECORD()
@@ -891,9 +892,13 @@ MCNameRef MCScriptGetNameOfLocalVariableInModule(MCScriptModuleRef self, MCScrip
     MCScriptHandlerDefinition *t_handler;
     t_handler = static_cast<MCScriptHandlerDefinition *>(p_definition);
     
-    // TODO - variable names
+    MCScriptHandlerType *t_type;
+    t_type = static_cast<MCScriptHandlerType *>(self -> types[t_handler -> type]);
     
-    return kMCEmptyName;
+    if (p_index < t_type -> parameter_name_count)
+        return t_type -> parameter_names[p_index];
+    
+    return t_handler -> local_names[p_index - t_type -> parameter_name_count];
 }
 
 MCNameRef MCScriptGetNameOfGlobalVariableInModule(MCScriptModuleRef self, uindex_t p_index)
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -260,6 +260,9 @@ struct MCScriptHandlerDefinition: public MCScriptCommonHandlerDefinition
     uindex_t *local_types;
     uindex_t local_type_count;
     
+    MCNameRef *local_names;
+    uindex_t local_name_count;
+    
 	uindex_t start_address;
 	uindex_t finish_address;
     

Original file line number	Diff line number	Diff line change
`@@ -1223,14 +1223,16 @@ void MCScriptAddVariableToHandlerInModule(MCScriptModuleBuilderRef self, MCNameR`
`1223`	`1223`	`MCScriptHandlerDefinition *t_handler;`
`1224`	`1224`	`t_handler = static_cast<MCScriptHandlerDefinition *>(self -> module . definitions[self -> current_handler]);`
`1225`	`1225`
`1226`		`- if (!MCMemoryResizeArray(t_handler -> local_type_count + 1, t_handler -> local_types, t_handler -> local_type_count))`
	`1226`	`+ if (!MCMemoryResizeArray(t_handler -> local_type_count + 1, t_handler -> local_types, t_handler -> local_type_count) \|\|`
	`1227`	`+ !MCMemoryResizeArray(t_handler -> local_name_count + 1, t_handler -> local_names, t_handler -> local_name_count))`
`1227`	`1228`	`{`
`1228`	`1229`	`r_index = 0;`
`1229`	`1230`	`self -> valid = false;`
`1230`	`1231`	`return;`
`1231`	`1232`	`}`
`1232`	`1233`
`1233`	`1234`	`t_handler -> local_types[t_handler -> local_type_count - 1] = p_type;`
	`1235`	`+ t_handler -> local_names[t_handler -> local_name_count - 1] = MCValueRetain(p_name);`
`1234`	`1236`
`1235`	`1237`	`r_index = self -> current_param_count + t_handler -> local_type_count - 1;`
`1236`	`1238`	`}`