[[ Compiler ]] Fix output of position info (was previously handler relative addresses, rather than global).

runrevmark · runrevmark · commit 25f561ebbfd1 · 2014-12-17T12:20:29.000Z
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -1143,6 +1143,8 @@ void MCScriptEndHandlerInModule(MCScriptModuleBuilderRef self)
         t_operands[t_address_index] = (1 << 31) | t_encoded_target_address;
     }
     
+    uindex_t t_pos_address_offset;
+    t_pos_address_offset = self -> module . bytecode_count;
     for(uindex_t i = 0; i < self -> instruction_count; i++)
     {
         MCScriptBytecodeOp t_op;
@@ -1154,7 +1156,7 @@ void MCScriptEndHandlerInModule(MCScriptModuleBuilderRef self)
         t_arity = self -> instructions[i] . arity;
         t_operands = &self -> operands[self -> instructions[i] . operands];
         
-        __emit_position(self, t_address, self -> instructions[i] . file, self -> instructions[i] . line);
+        __emit_position(self, t_pos_address_offset + t_address, self -> instructions[i] . file, self -> instructions[i] . line);
         
         __emit_bytecode_byte(self, t_op | (MCMin(t_arity, 15) << 4));
         

Original file line number	Diff line number	Diff line change
`@@ -1143,6 +1143,8 @@ void MCScriptEndHandlerInModule(MCScriptModuleBuilderRef self)`
`1143`	`1143`	`t_operands[t_address_index] = (1 << 31) \| t_encoded_target_address;`
`1144`	`1144`	`}`
`1145`	`1145`
	`1146`	`+ uindex_t t_pos_address_offset;`
	`1147`	`+ t_pos_address_offset = self -> module . bytecode_count;`
`1146`	`1148`	`for(uindex_t i = 0; i < self -> instruction_count; i++)`
`1147`	`1149`	`{`
`1148`	`1150`	`MCScriptBytecodeOp t_op;`
`@@ -1154,7 +1156,7 @@ void MCScriptEndHandlerInModule(MCScriptModuleBuilderRef self)`
`1154`	`1156`	`t_arity = self -> instructions[i] . arity;`
`1155`	`1157`	`t_operands = &self -> operands[self -> instructions[i] . operands];`
`1156`	`1158`
`1157`		`- __emit_position(self, t_address, self -> instructions[i] . file, self -> instructions[i] . line);`
	`1159`	`+ __emit_position(self, t_pos_address_offset + t_address, self -> instructions[i] . file, self -> instructions[i] . line);`
`1158`	`1160`
`1159`	`1161`	`__emit_bytecode_byte(self, t_op \| (MCMin(t_arity, 15) << 4));`
`1160`	`1162`