Assign tree nodes to graph type nodes

1 files changed, 40 insertions, 18 deletions

diff --git a/odb/semantics/fundamental.hxx b/odb/semantics/fundamental.hxx
index aa8225a..eea49a8 100644
--- a/odb/semantics/fundamental.hxx
+++ b/odb/semantics/fundamental.hxx
@@ -14,16 +14,23 @@ namespace semantics
   // Fundamental C++ types.
   //
 
-  class fund_type: public type {};
+  class fund_type: public type
+  {
+  protected:
+    fund_type (tree tn)
+        : type (tn) {}
+  };
 
   struct fund_void: fund_type
   {
-    fund_void (): node (path ("<fundamental>"), 0, 0) {}
+    fund_void (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_bool: fund_type
   {
-    fund_bool (): node (path ("<fundamental>"), 0, 0) {}
+    fund_bool (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   //
@@ -32,62 +39,74 @@ namespace semantics
 
   struct fund_char: fund_type
   {
-    fund_char (): node (path ("<fundamental>"), 0, 0) {}
+    fund_char (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_wchar: fund_type
   {
-    fund_wchar (): node (path ("<fundamental>"), 0, 0) {}
+    fund_wchar (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_signed_char: fund_type
   {
-    fund_signed_char (): node (path ("<fundamental>"), 0, 0) {}
+    fund_signed_char (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_unsigned_char: fund_type
   {
-    fund_unsigned_char (): node (path ("<fundamental>"), 0, 0) {}
+    fund_unsigned_char (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_short: fund_type
   {
-    fund_short (): node (path ("<fundamental>"), 0, 0) {}
+    fund_short (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_unsigned_short: fund_type
   {
-    fund_unsigned_short (): node (path ("<fundamental>"), 0, 0) {}
+    fund_unsigned_short (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_int: fund_type
   {
-    fund_int (): node (path ("<fundamental>"), 0, 0) {}
+    fund_int (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_unsigned_int: fund_type
   {
-    fund_unsigned_int (): node (path ("<fundamental>"), 0, 0) {}
+    fund_unsigned_int (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_long: fund_type
   {
-    fund_long (): node (path ("<fundamental>"), 0, 0) {}
+    fund_long (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_unsigned_long: fund_type
   {
-    fund_unsigned_long (): node (path ("<fundamental>"), 0, 0) {}
+    fund_unsigned_long (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_long_long: fund_type
   {
-    fund_long_long (): node (path ("<fundamental>"), 0, 0) {}
+    fund_long_long (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_unsigned_long_long: fund_type
   {
-    fund_unsigned_long_long (): node (path ("<fundamental>"), 0, 0) {}
+    fund_unsigned_long_long (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   //
@@ -96,17 +115,20 @@ namespace semantics
 
   struct fund_float: fund_type
   {
-    fund_float (): node (path ("<fundamental>"), 0, 0) {}
+    fund_float (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_double: fund_type
   {
-    fund_double (): node (path ("<fundamental>"), 0, 0) {}
+    fund_double (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 
   struct fund_long_double: fund_type
   {
-    fund_long_double (): node (path ("<fundamental>"), 0, 0) {}
+    fund_long_double (tree tn)
+        : node (path ("<fundamental>"), 0, 0), fund_type (tn) {}
   };
 }