Eliminate use of Nullable<T>, which should make life a bit easier for…

… mberends++ when porting.
jnthn · Aug 23, 2010 · 4c8ee84 · 4c8ee84
1 parent 3446bc2
commit 4c8ee84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/dotnet/runtime/Metamodel/Representations/P6capture.cs b/dotnet/runtime/Metamodel/Representations/P6capture.cs
@@ -44,8 +44,7 @@ public override RakudoObject type_object_for(RakudoObject MetaPackage)
         /// <returns></returns>
         public override RakudoObject instance_of(RakudoObject WHAT)
         {
-            var Object = new Instance(WHAT.STable);
-            return Object;
+            return new Instance(WHAT.STable);
         }
 
         /// <summary>

diff --git a/dotnet/runtime/Metamodel/Representations/P6int.cs b/dotnet/runtime/Metamodel/Representations/P6int.cs
@@ -16,7 +16,8 @@ public sealed class P6int : Representation
         /// </summary>
         internal sealed class Instance : RakudoObject
         {
-            public Nullable<int> Value;
+            public int Value;
+            public bool Undefined;
             public Instance(SharedTable STable)
             {
                 this.STable = STable;
@@ -33,8 +34,10 @@ public override RakudoObject type_object_for(RakudoObject MetaPackage)
             var STable = new SharedTable();
             STable.HOW = MetaPackage;
             STable.REPR = this;
-            STable.WHAT = new Instance(STable);
-            return STable.WHAT;
+            var WHAT = new Instance(STable);
+            WHAT.Undefined = true;
+            STable.WHAT = WHAT;
+            return WHAT;
         }
 
         /// <summary>
@@ -44,9 +47,7 @@ public override RakudoObject type_object_for(RakudoObject MetaPackage)
         /// <returns></returns>
         public override RakudoObject instance_of(RakudoObject WHAT)
         {
-            var Object = new Instance(WHAT.STable);
-            Object.Value = 0;
-            return Object;
+            return new Instance(WHAT.STable);
         }
 
         /// <summary>
@@ -56,7 +57,7 @@ public override RakudoObject instance_of(RakudoObject WHAT)
         /// <returns></returns>
         public override bool defined(RakudoObject Obj)
         {
-            return ((Instance)Obj).Value.HasValue;
+            return !((Instance)Obj).Undefined;
         }
 
         public override RakudoObject get_attribute(RakudoObject Object, RakudoObject ClassHandle, string Name)
@@ -91,7 +92,7 @@ public override void set_int(RakudoObject Object, int Value)
 
         public override int get_int(RakudoObject Object)
         {
-            return ((Instance)Object).Value.Value;
+            return ((Instance)Object).Value;
         }
 
         public override void set_num(RakudoObject Object, double Value)

diff --git a/dotnet/runtime/Metamodel/Representations/P6num.cs b/dotnet/runtime/Metamodel/Representations/P6num.cs
@@ -16,7 +16,8 @@ public sealed class P6num : Representation
         /// </summary>
         internal sealed class Instance : RakudoObject
         {
-            public Nullable<double> Value;
+            public double Value;
+            public bool Undefined;
             public Instance(SharedTable STable)
             {
                 this.STable = STable;
@@ -33,7 +34,9 @@ public override RakudoObject type_object_for(RakudoObject MetaPackage)
             var STable = new SharedTable();
             STable.HOW = MetaPackage;
             STable.REPR = this;
-            STable.WHAT = new Instance(STable);
+            var WHAT = new Instance(STable);
+            WHAT.Undefined = true;
+            STable.WHAT = WHAT;
             return STable.WHAT;
         }
 
@@ -44,9 +47,7 @@ public override RakudoObject type_object_for(RakudoObject MetaPackage)
         /// <returns></returns>
         public override RakudoObject instance_of(RakudoObject WHAT)
         {
-            var Object = new Instance(WHAT.STable);
-            Object.Value = 0.0;
-            return Object;
+            return new Instance(WHAT.STable);
         }
 
         /// <summary>
@@ -56,7 +57,7 @@ public override RakudoObject instance_of(RakudoObject WHAT)
         /// <returns></returns>
         public override bool defined(RakudoObject Obj)
         {
-            return ((Instance)Obj).Value.HasValue;
+            return !((Instance)Obj).Undefined;
         }
 
         public override RakudoObject get_attribute(RakudoObject Object, RakudoObject ClassHandle, string Name)
@@ -101,7 +102,7 @@ public override void set_num(RakudoObject Object, double Value)
 
         public override double get_num(RakudoObject Object)
         {
-            return ((Instance)Object).Value.Value;
+            return ((Instance)Object).Value;
         }
 
         public override void set_str(RakudoObject Object, string Value)