Fix source line assumption in sbl reader. - Statements can cross source line boundaries

arr committed 9 years ago

Commit 5ef656f1 parent 4afaca44 files · +10 −7Browse files

Unified · Split

4 files

@@ -17,7 +17,7 @@ char: <int> · 16 unmodified lines
17		17
18	type-table: <count> '\n' type*	18	type-table: <count> '\n' type*
19	type:	19	type:
20	'@' type-index '\n' # Type table reference	20	'@' type-index '\n' # Type table reference
21	'a' adt-item # ADT	21	'a' adt-item # ADT
22	'p' adt-item tag-table # ADT-Pick	22	'p' adt-item tag-table # ADT-Pick
23	't' size '.' id-table # Tuple	23	't' size '.' id-table # Tuple

         source_ref_t src;
         // Initialize the source with the last state
-        src.source_id = fc.last_file;
+        src.begin_source_id = fc.last_file;
         src.begin_line = fc.last_line;
         src.end_line = fc.last_line;
         for (auto i = std::size_t{ 0 }; i < src_parts.size(); ++i)
                 }
                 else if (pos[j] == ':')
                 {
-                    assert((i == 0 || src.source_id == v) && "Source position should not change across statements");
+                    if (i == 0)
-                    src.source_id = v;
+                        src.begin_source_id = v;
+                    src.end_source_id = v;
                     fc.last_file = v;
                 }
             }
             curr_item.debug_statement = std::stoi(pc_item_parts[1]);
             // Record the current source and line ID since those are the new default values
-            last_source = curr_item.source.source_id;
+            last_source = curr_item.source.end_source_id;
             last_line = curr_item.source.end_line;
             pc_table[i] = std::move(curr_item);

@@ -1064,7 +1064,7 @@ std::vector<std::string> debugger::resolve_to_function_source_line( · 1063 unmodified lines
1064	ss << function_name << " at ";	1064	ss << function_name << " at ";
1065		1065
1066	const auto source_loc = d.current_source_location();	1066	const auto source_loc = d.current_source_location();
1067	ss << d.get_source_by_id(source_loc.source_id)	1067	ss << d.get_source_by_id(source_loc.begin_source_id)
1068	<< ':'	1068	<< ':'
1069	<< source_loc.begin_line;	1069	<< source_loc.begin_line;
1070		1070

         // Reference into source code
         struct source_ref_t
         {
-            int32_t source_id;
+            int32_t begin_source_id;
             int32_t begin_line;
             int32_t begin_column;
+            int32_t end_source_id;
             int32_t end_line;
             int32_t end_column;
         };