Ticket #281: count.patch

Source/Snapshot/Cobra.Lang/Extensions.cobra

@@ -50 +50 @@
                 if .length == 0, return this
                 return this[:1].toUpper + this[1:]
 
-        def count(c as char) as int
+        def countOf(c as char) as int
             """ Return a count of the number of occurrences of the char in this string. """
             test
-                assert ''.count(c'x')==0
-                assert 'x'.count(c'x')==1
-                assert 'X'.count(c'x')==0  # case sensitive
-                assert ' ! ! '.count(c'!')==2
+                assert ''.countOf(c'x')==0
+                assert 'x'.countOf(c'x')==1
+                assert 'X'.countOf(c'x')==0  # case sensitive
+                assert ' ! ! '.countOf(c'!')==2
             body
                 count = 0
                 for ch in this

Source/Tokenizer.cobra

@@ -586 +586 @@
             if _sourceLine is nil
                 # end of source
                 return false
-            numLines = _sourceLine.count(c'\n')
+            numLines = _sourceLine.countOf(c'\n')
             if numLines == 0 and _willAlwaysEndWithNewLine
                 _sourceLine += "\n"
             #trace sourceLine

Source/Cobra.Lang/Extensions.cobra

@@ -74 +74 @@
                 if .length == 0, return this
                 return this[:1].toUpper + this[1:]
 
-        def count(c as char) as int
+        def count as int
+            """
+            Return count of single chars in this string i.e this.length.
+            Analogous to count on Collections, Enumerables (list).
+            """
+            test
+                assert ''.count == 0
+                assert 'chuck'.count == 5 
+                s = 'split(sep, 2) is not easier,simpler or more obvious than break(sep)'
+                assert s.count == s.length
+            body
+                return .length
+            
+        def countOf(c as char) as int
             """ Return a count of the number of occurrences of the char in this string. """
             test
-                assert ''.count(c'x')==0
-                assert 'x'.count(c'x')==1
-                assert 'X'.count(c'x')==0  # case sensitive
-                assert ' ! ! '.count(c'!')==2
+                assert ''.countOf(c'x')==0
+                assert 'x'.countOf(c'x')==1
+                assert 'X'.countOf(c'x')==0  # case sensitive
+                assert ' ! ! '.countOf(c'!')==2
             body
                 count = 0
                 for ch in this, if c == ch, count += 1
                 return count
 
-        def count(substring as String) as int
+        def countOf(substring as String) as int
             """ Return a count of the number of occurrences of the substring in this string. """
             test
-                assert ''.count('aoeu') == 0
-                assert 'x'.count('x') == 1
-                assert 'xyxy'.count('xy') == 2
-                assert 'xyxy'.count('a') == 0
+                assert ''.countOf('aoeu') == 0
+                assert 'x'.countOf('x') == 1
+                assert 'xyxy'.countOf('xy') == 2
+                assert 'xyxy'.countOf('a') == 0
             body
                 return (.length - .replace(substring, '').length) // substring.length
 

Source/CommandLine.cobra

@@ -514 +514 @@
     """
 
     get versionString as String is shared
-        ensure result.count(c'.') >= 2
+        ensure result.countOf(c'.') >= 2
 
         # Can't just take CobraCore.versionDescription as is, because that will be the one from Snapshot,
         # not the current Source directory. And Snapshot can be a final release such as '0.7.4' for a
@@ -999 +999 @@
         reMatch = Regex(r'\d+\.\d+\.\d+').match(.versionString)
         assert reMatch.success
         version = reMatch.value to !
-        assert version.count(c'.') == 2  # ex: '0.8.0'
+        assert version.countOf(c'.') == 2  # ex: '0.8.0'
         if ' ' in .versionString or 'post' in .versionString  # ex: '0.8.0 post'
             # 'post' versions have a fourth version component of 1, as opposed to 0
             version += '.1'
-            assert version.count(c'.') == 3
+            assert version.countOf(c'.') == 3
         _options.addExtraUse('use System.Reflection')
         _options.addExtraSource("assembly\n\thas AssemblyVersion('[version]')\n")
         .doCompile(List<of String>(), true, false, nil)

Source/Phases/BindRunTimeLibraryPhase.cobra

@@ -39 +39 @@
         runTimePaths = c.commandLineArgParser.readFilesFile(filesPath)
         runTimePaths.reverse
         runTimeLibNativeSourceFileName = c.backEnd.runTimeLibNativeSourceFileName   # 'Native.cs', 'Native.m', etc.
-        assert runTimeLibNativeSourceFileName.count(c'.') == 1
+        assert runTimeLibNativeSourceFileName.countOf(c'.') == 1
         for runTimePath in runTimePaths
             if Path.getFileName(runTimePath) == runTimeLibNativeSourceFileName
                 suffix = .options.embedRunTimeSuffix

Source/BackEndClr/ScanClrType.cobra

@@ -221 +221 @@
                     .warning(CobraWarning('Already have declaration "[clrType.name]" in namespace "[curNameSpace.fullName]".'))
                 else
                     if type.isClass
-                        if type.name.startsWith('Extend_') and type.name.count(c'_') >= 2
+                        if type.name.startsWith('Extend_') and type.name.countOf(c'_') >= 2
                             curNameSpace.addDecl(Extension(clrType, .backEnd))
                         else
                             curNameSpace.addDecl(Class(clrType, .backEnd))

Source/BackEndJvm/JvmJarSig.cobra

@@ -116 +116 @@
             assert fullName.contains('<') and fullName.endsWith('>')
             canonName = fullName.before('<')
             #params = fullName.after('<')[0:-1] # drop end '>'
-            #nParams = 1 + params.count(c',') # params.countOf(c',')  
+            #nParams = 1 + params.countOf(c',') # params.countOf(c',')  
             #assert canonName.contains('.')
             #idx = canonName.lastIndexOf('.')
             #gDefName = canonName[idx+1:] + '`[nParams]'
@@ -519 +519 @@
         
         _isArray = true
         _arrayComponentType = elementType
-        _arrayDimension = name.count(c'[')
+        _arrayDimension = name.countOf(c'[')
         
         # has properties 'length' and method 'getLength' and indexer for get and set
         methodList = List<of JavaMethodInfo>()

Source/BackEndJvm/ScanJvmType.cobra

@@ -137 +137 @@
                     .warning(CobraWarning('Already have declaration "[jvmNative.name]" in namespace "[curNameSpace.fullName]".'))
                 else
                     if jvmType.isClass
-                        if jvmType.name.startsWith('Extend_') and jvmType.name.count(c'_') >= 2
+                        if jvmType.name.startsWith('Extend_') and jvmType.name.countOf(c'_') >= 2
                             # e.g.Extend_String - TODO 
                             curNameSpace.addDecl(Extension(jvmNative, .backEnd))
                         else

Source/BackEndJvm/JavaGenerator.cobra

@@ -280 +280 @@
         if false
             # kind of silly, but it works:
             d = Dictionary<of int, int>()
-            for i in 1 : File.readAllText(_javaFileName).count(c'\n')+1
+            for i in 1 : File.readAllText(_javaFileName).countOf(c'\n')+1
                 d[i] = i
             return d    
         return nil

Source/CobraTokenizer.cobra

@@ -363 +363 @@
         assert tok.text.endsWith(' ')
         # this is okay on continued lines
         if .justDidLineContinuation
-            indentLevel = tok.text.count(c'\t') + tok.text.count(c' ') // 4
+            indentLevel = tok.text.countOf(c'\t') + tok.text.countOf(c' ') // 4
             return _processNumIndentLevels(indentLevel)  # will check continuation indentation rules
         else
             return .onINDENT_MIXED_TS(tok)
@@ -385 +385 @@
         return .onINDENT_MIXED_TS(tok)
 
     def onINDENT_ALL_TABS(tok as IToken) as IToken?
-        numTabs = tok.text.count(c'\t')
+        numTabs = tok.text.countOf(c'\t')
         return _processNumIndentLevels(numTabs)
 
     def onINDENT_ALL_SPACES(tok as IToken) as IToken?
-        numSpaces = tok.text.count(c' ')
+        numSpaces = tok.text.countOf(c' ')
         if numSpaces % 4 and not .justDidLineContinuation # yes, 4. hard coded, intentionally.
             # TODO: should really just record an error and take (numSpaces/4).round as the indent
             .throwError('Space-based indentation must be a multiple of 4. This line has a remainder of [numSpaces%4].')

Tests/200-misc/855-countOf.cobra

@@ +1 @@
+# test string extns countOf (instead of count)
+class TestCountOf
+    def main is shared
+        # chars
+        s = 'a.b.c.d'
+        c = s.countOf(c'.') 
+        assert c == 3
+        assert s.countOf(c'-') == 0
+    
+        #substrings
+        assert s.countOf('.') == 3
+        assert s.countOf('-') == 0
+        assert s.countOf('.c') == 1
+        
+        # chk count noargs same as length
+        assert ''.count == 0
+        assert "".count == 0
+        assert 'xyzzy'.count == 5
+        s = 'ezri dax is an excellent successor to jadzia dax'
+        assert s.count == s.length
+        

Tests/200-misc/850-count.cobra

@@ +1 @@
+# test/ensure that String Extn count(char) is changed to be more analogous
+# to count on other .Net things ( like Collections) - i.e no args
+class TestCount
+    def main is shared
+        s = 'a.b.c.d'
+        c = s.count(c'.') # .error.  The method "count" is expecting 0 arguments, but 1 are being supplied in this call
+        assert c == 3 # notreached

Tests/700-command-line/900-check-complier-message-format/200-check-compiler-message-format.cobra

@@ -35 +35 @@
                 if 'error' in line, foundError = true  # expecting an error for each file tested
                 assert '(' in line
                 assert re.match(line).success, line
-            if '(' in line, assert line.count(c'(') == 1
+            if '(' in line, assert line.countOf(c'(') == 1
         assert foundError
         
     def run(args as String) as String