Changeset 1581

Timestamp:

08/18/08 08:40:54 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: Some bitwise operations with integer literals of 16 or 8 bits produce invalid compilation errors.
reported-by:hopscc

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Expr.cobra (modified) (2 diffs)
• Tests/100-basics/920-hex-lit.cobra (modified) (2 diffs)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -101 +101 @@
 
 * Fixed: Using `ref` on a variable that experienced an error causes an internal exception.
+
+* Fixed: Some bitwise operations with integer literals of 16 or 8 bits produce invalid compilation errors.

cobra/trunk/Source/Expr.cobra

@@ -242 +242 @@
                 """
                 type = .type
-                cast = _contextType and type.isDynamic
+                cast = false
+                if _contextType
+                        if type.isDynamic
+                                cast = true
+                        else if type inherits IntType
+                                if type.size < 32, cast = true
                 if cast
                         if parens, sw.write('(')
@@ -2762 +2767 @@
 
         get asSharp as String is override
-                return _value.toString
+                s = ''
+                if (info = .token.info) inherits int
+                        branch info
+                                on - 8, s = 'System.SByte'
+                                on + 8, s = 'System.Byte'
+                                on -16, s = 'System.Int16'
+                                on +16, s = 'System.UInt16'
+                                on -32, s = ''
+                                on +32, s = 'U'
+                                on -64, s = 'L'
+                                on +64, s = 'UL'
+                                else, throw FallThroughException(info)
+                if s.length <= 2
+                        return _value.toString + s
+                else
+                        return '([s])[_value.toString]'
 
 

cobra/trunk/Tests/100-basics/920-hex-lit.cobra

@@ -137 +137 @@
                         assert b.getType is Byte
                                 
-                        # These dont compile for some reason - same with non hex vals
-                        #b = 255u8
-                        #b = b & 0x1fu8
-                        ## OR
-                        ##b = b & 31u8
-                        #assert b == 0x1fu8
-                        #b = 255u8
-                        #b1 = 0x1fu8
-                        #b = b & b1
-                        #print b
+                        b = 255u8
+                        b = b & 0x1fu8
+                        assert b == 0x1fu8
+
+                        b = 255u8
+                        b = b & 31u8
+                        assert b == 0x1fu8
+
+                        b = 255u8
+                        b1 = 0x1fu8
+                        b = b & b1
+                        assert b == 0x1fu8
         
                         c = 0x0_u8
@@ -152 +154 @@
                         assert c == 0x1e_u8
                                 
-                        # Neither do these
-                        #c = 0x0_u8
-                        #c = c | 0x0_u8
-                        #assert c == 0x1e_u8
-                        #
-                        #c = 0x0_u8
-                        #c1 = 0x0_u8
-                        #c = c | c1
-                        #assert c == 0x1e_u8
-                                
+                        c = 0x0_u8
+                        c = c | 0x1e_u8
+                        assert c == 0x1e_u8
+
+                        c = 0x0_u8
+                        c1 = 0x1e_u8
+                        c = c | c1
+                        assert c == 0x1e_u8
+        
                 def main is shared
                         .lit