Journalling symbol table: enable nesting

smowton · smowton · commit f0f50e32a7c3 · 2018-01-24T16:55:34.000Z
Previously only one layer of journal was possible (i.e. a journalling proxy atop a regular
symbol table); now we can layer them as deeply as we please. This will be useful so that
different layers of the program loader can keep records delimited at different points.
diff --git a/src/util/journalling_symbol_table.h b/src/util/journalling_symbol_table.h
@@ -38,7 +38,7 @@ class journalling_symbol_tablet : public symbol_table_baset
   typedef std::unordered_set<irep_idt, irep_id_hash> changesett;
 
 private:
-  symbol_tablet &base_symbol_table;
+  symbol_table_baset &base_symbol_table;
   // Symbols originally in the table will never be marked inserted
   changesett inserted;
   // get_writeable marks an existing symbol updated
@@ -74,7 +74,7 @@ class journalling_symbol_tablet : public symbol_table_baset
 
   virtual const symbol_tablet &get_symbol_table() const override
   {
-    return base_symbol_table;
+    return base_symbol_table.get_symbol_table();
   }
 
   static journalling_symbol_tablet wrap(symbol_tablet &base_symbol_table)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class journalling_symbol_tablet : public symbol_table_baset`
`38`	`38`	`typedef std::unordered_set<irep_idt, irep_id_hash> changesett;`
`39`	`39`
`40`	`40`	`private:`
`41`		`- symbol_tablet &base_symbol_table;`
	`41`	`+ symbol_table_baset &base_symbol_table;`
`42`	`42`	`// Symbols originally in the table will never be marked inserted`
`43`	`43`	`changesett inserted;`
`44`	`44`	`// get_writeable marks an existing symbol updated`
`@@ -74,7 +74,7 @@ class journalling_symbol_tablet : public symbol_table_baset`
`74`	`74`
`75`	`75`	`virtual const symbol_tablet &get_symbol_table() const override`
`76`	`76`	`{`
`77`		`- return base_symbol_table;`
	`77`	`+ return base_symbol_table.get_symbol_table();`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`static journalling_symbol_tablet wrap(symbol_tablet &base_symbol_table)`