Value set: add declared-on-type entry member

smowton · peterschrammel · commit 3cd62e066abf · 2017-03-10T20:18:27.000Z
This is essentially specific to the security scanner's needs, but is
also impossible to add to value-set without templating the class, thus
moving ~2000LOC into its header file. This is the temporary kludge until
we bite the bullet and do that, or think of something smarter.
diff --git a/src/pointer-analysis/value_set.h b/src/pointer-analysis/value_set.h
@@ -102,7 +102,7 @@ class value_sett
     object_mapt object_map;
     idt identifier;
     std::string suffix;
-
+    typet declared_on_type;
     entryt()
     {
     }
@@ -112,6 +112,13 @@ class value_sett
       suffix(_suffix)
     {
     }
+
+    entryt(const idt &_identifier, const std::string &_suffix, const typet &_declared_on_type):
+      identifier(_identifier),
+      suffix(_suffix),
+      declared_on_type(_declared_on_type)
+    {
+    }
   };
 
   typedef std::set<exprt> expr_sett;

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ class value_sett`
`102`	`102`	`object_mapt object_map;`
`103`	`103`	`idt identifier;`
`104`	`104`	`std::string suffix;`
`105`		`-`
	`105`	`+ typet declared_on_type;`
`106`	`106`	`entryt()`
`107`	`107`	`{`
`108`	`108`	`}`
`@@ -112,6 +112,13 @@ class value_sett`
`112`	`112`	`suffix(_suffix)`
`113`	`113`	`{`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ entryt(const idt &_identifier, const std::string &_suffix, const typet &_declared_on_type):`
	`117`	`+ identifier(_identifier),`
	`118`	`+ suffix(_suffix),`
	`119`	`+ declared_on_type(_declared_on_type)`
	`120`	`+ {`
	`121`	`+ }`
`115`	`122`	`};`
`116`	`123`
`117`	`124`	`typedef std::set<exprt> expr_sett;`