Changeset 1584

Timestamp:

08/19/08 05:43:00 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup.

Location:

cobra/trunk/Source

Files:

• Boxes.cobra (modified) (1 diff)
• CobraParser.cobra (modified) (1 diff)
• Utils.cobra (modified) (3 diffs)

cobra/trunk/Source/Boxes.cobra

@@ -318 +318 @@
 
                 # eliminate duplicates
-                # CC: suggs = List<of String>(Set<of String>(suggs))
-                d = Dictionary<of String, int>()
-                for sugg in suggs
-                        d[sugg] = 1
-                suggs = List<of String>(d.keys)
-                
+                suggs = List<of String>(Set<of String>(suggs))
                 suggs.sort
 
                 # okay to sort by alpha, but if a name differs only by case, put it up front
                 lowerName = name.toLower
-                for i = 0 .. suggs.count
+                for i in suggs.count
                         if suggs[i].toLower == lowerName
                                 sugg = suggs[i]

cobra/trunk/Source/CobraParser.cobra

@@ -28 +28 @@
                 return true
 
-        # CC: get fileName from var is override
-        get fileName as String is override
-                return _fileName
-
-        # CC: get lineNum from var is override
-        get lineNum as int is override
-                return _lineNum
+        get fileName from var is override
+
+        get lineNum from var is override
 
 

cobra/trunk/Source/Utils.cobra

@@ -9 +9 @@
 extend String
 
+/#
+        CC: parser error, this won''t fly:
         def capped as String
-                return Utils.capped(this)
-
+                """
+                Returns the string with the first character capitalized.
+                Returns a blank string for a blank string.
+                """
+#               CC: contracts on extension methods
+#               ensure
+#                       result.length == .length
+#                       result.length implies result[0] == result[0].toUpper
+                test
+                        assert 'chuck'.capped == 'Chuck'
+                        assert 'Chuck'.capped == 'Chuck'
+                        assert ''.capped == ''
+                        assert ' foo'.capped == ' foo'
+                        assert 'f'.capped == 'F'
+                        assert '1aoeu'.capped == '1aoeu'
+                body
+                        if .length == 0, return this
+                        return this[0:1].toUpper + this[1:]
+#/
+
+        def capped as String
+                """
+                Returns the string with the first character capitalized.
+                Returns a blank string for a blank string.
+                """
+                test
+                        assert 'chuck'.capped == 'Chuck'
+                        assert 'Chuck'.capped == 'Chuck'
+                        assert ''.capped == ''
+                        assert ' foo'.capped == ' foo'
+                        assert 'f'.capped == 'F'
+                        assert '1aoeu'.capped == '1aoeu'
+                body
+                        if .length == 0, return this
+                        return this[0:1].toUpper + this[1:]
 
 class Utils
@@ -28 +63 @@
 
                 def normalizePath(path as String) as String
-                        # TODO: this needs cleanup
-                        while path.startsWith('.\\')
-                                path = path.substring(2)
-                        while path.startsWith('./')
-                                path = path.substring(2)
+                        while path.startsWith('.\\'), path = path[2:]
+                        while path.startsWith('./'), path = path[2:]
                         return path
 
@@ -48 +80 @@
                         # Could be made more sophisitcated in the future
                         return name + 's'
-
-                def capped(s as String) as String
-                        """
-                        Returns the string with the first character capitalized.
-                        Returns a blank string for a blank string.
-                        """
-                        ensure
-                                result.length == s.length
-                                result.length implies result[0] == result[0].toUpper
-                        test
-                                assert Utils.capped('chuck')=='Chuck'
-                                assert Utils.capped('Chuck')=='Chuck'
-                                assert Utils.capped('')==''
-                                assert Utils.capped(' foo')==' foo'
-                                assert Utils.capped('f')=='F'
-                                assert Utils.capped('1aoeu')=='1aoeu'
-                        body
-                                if s.length==0
-                                        return s
-                                return s[0:1].toUpper + s[1:]
 
                 def isCapped(s as String) as bool