Merge from parser2 branch

tools/isledecomp/tests/samples/oneline_function.cpp

@@ -1,10 +1,10 @@
 // Sample for python unit tests
 // Not part of the decomp
 
-// OFFSET: TEST 0x1234
+// FUNCTION: TEST 0x1234
 void short_function() { static char* msg = "oneliner"; }
 
-// OFFSET: TEST 0x5555
+// FUNCTION: TEST 0x5555
 void function_after_one_liner()
 {
   // This function comes after the previous that is on a single line.