Changeset 1702

Timestamp:

10/23/08 12:54:47 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Added storage type specification for enums.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/CobraParser.cobra (modified) (1 diff)
• Source/SharpGenerator.cobra (modified) (1 diff)
• Tests/100-basics/307-enums.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
+
+* Added storage type specification for enums:
+.code
+        enum Foo
+                of uint64
+                Bar
+                Baz
 
 * Added new install-from-workspace command in the Source directory. This makes installing out of a Subversion workspace very easy and reliable. Documentation is in the doc string at the top of InstallFromWorkspace.cobra.

cobra/trunk/Source/CobraParser.cobra

@@ -951 +951 @@
                 isNames = .isDeclNames
                 attribs = .hasAttribs
-                if .peek.which=='OF'
+                if .optional('OF')
                         storageType = .typeId to ?
                 docString = .docString

cobra/trunk/Source/SharpGenerator.cobra

@@ -835 +835 @@
                 storageType = _storageType
                 if storageType and storageType is not .compiler.intType
-                        sw.write(' [storageType.sharpRef]')
+                        # Cannot say UInt64 because:
+                        # C# error: Type byte, sbyte, short, ushort, int, uint, long, or ulong expected
+                        st = storageType to IntType
+                        branch st.size
+                                on  8, t = 'byte'
+                                on 16, t = 'short'
+                                on 32, t = 'int'
+                                on 64, t = 'long'
+                                else, throw FallThroughException(st)
+                        if not st.isSigned, t = 'u' + t
+                        sw.write(' : [t]')
                 sw.write(' {\n')
                 sw.indent

cobra/trunk/Tests/100-basics/307-enums.cobra

@@ -1 +1 @@
 enum Medium
+        of uint64
         air
         land