Ticket #36: nextToken-cleanup2.patch

Source/Tokenizer.cobra

@@ -436 +436 @@
         Returns all remaining tokens as a list.
         """
         tokens = List<of IToken>()
+        #st = DateTime.now
         while true
             t = .nextToken
             if t
                 tokens.add(t)
             else
                 break
+        # Determine timings for various Tokeniser lexing changes
+        #duration = DateTime.now.subtract(st)
+        #if  tokens.count > 100 and duration > TimeSpan(0)
+        #   avTicksPerToken = (duration.ticks / (tokens.count to int64)) to int
+        #   msecs = avTicksPerToken/10000
+        #   fileNm = _fileName
+        #   fileNm = if( fileNm.startsWith("("), '(None)', Path.getFileName(fileNm) )
+        #   print "[fileNm.padRight(20)]\t[duration]\t[tokens.count]\t" stop
+        #   print " [msecs:N3] ms/Token av ([msecs/1000:N3]sec)"
         return tokens
 
     def restart
@@ -591 +601 @@
                     return nil
             try
                 assert _tokenDefs
-                if _narrowTokenDefs and _tokenDefs.count >= _minNumTokenDefsToNarrow
-                    assert _tokenDefsByFirstChar
-                    assert _sourceLine.length
-                    if _tokenDefsByFirstChar.containsKey(_sourceLine[0])
-                        # print 'Using short list for char: [_sourceLine[0]], [_sourceLine[0] to int]'
-                        tokenDefs = _tokenDefsByFirstChar[_sourceLine[0]]
-                    else
-                        tokenDefs = _tokenDefs to !
-                else
-                    tokenDefs = _tokenDefs to !
+                tokenDefs = _getCandidateTokenDefs(_sourceLine)
                 for tokenDef in tokenDefs
                     count += 1
-                    if tokenDef.ignoreCount
-                        tokenDef.ignoreCount -= 1
+                    if _skipMatchAttempt(tokenDef, _sourceLineIndex)
                         continue
-                    if not tokenDef.isActive
-                        continue
-                    if _sourceLineIndex>0 and tokenDef.requiresBOL
-                        continue
-                    if not .isActiveCall(tokenDef)
-                        continue
                     #print '<> Trying to match [tokenDef]'
                     sourceLine = _sourceLine to !
                     #print '_sourceLineIndex=[_sourceLineIndex]'
@@ -634 +628 @@
 
                     # enable methods to customize handling of tokens
                     reinvoke = false
-
-                    which = tok.which
-                    if _onTokenTypeCache.containsKey(which)
-                        meth = _onTokenTypeCache[which]
-                    else
-                        methName = 'On' + which
-                        meth = .getType.getMethod(methName)
-                        _onTokenTypeCache[which] = meth
-                        
+                    meth = _getTokenMethod(tok.which)
                     if meth
-                        try
-                            tok = meth.invoke(this, @[tok]) to IToken?
-                        catch tie as TargetInvocationException
-                            throw tie.innerException
-                        if tok is nil
-                            # skip token, so go to the next one
-                            reinvoke = true
-                        else
-                            # TODO: could probably make this more efficient by axing the queue and just checking for nextToken in this method
-                            while tok
-                                _tokenQueue.enqueue(tok)
-                                tok = tok.nextToken
-                            reinvoke = true  # to pick up the queue
+                        tok = _tokenPostProcess(meth, tok )
+                        # nil indicates skipped token - will re call this method
+                        if not tok 
+                            reinvoke = true  # to pick up next token after skipped
 
                     # finished with current line?
                     if _sourceLine.length==0
@@ -689 +666 @@
             _avgCount += count
             _avgCountNum += 1
 
+    def _getCandidateTokenDefs(sourceLine as String?) as List<of TokenDef>
+        if _narrowTokenDefs and _tokenDefs.count >= _minNumTokenDefsToNarrow
+            assert _tokenDefsByFirstChar
+            assert _sourceLine.length
+            if _tokenDefsByFirstChar.containsKey(_sourceLine[0])
+                # print 'Using short list for char: [_sourceLine[0]], [_sourceLine[0] to int]'
+                return _tokenDefsByFirstChar[_sourceLine[0]]
+        return _tokenDefs to !
+
+    def _skipMatchAttempt(tokenDef as TokenDef, sourceLineIndex as int) as bool
+        if tokenDef.ignoreCount
+            tokenDef.ignoreCount -= 1
+            return true
+        if not tokenDef.isActive
+            return true
+        if sourceLineIndex>0 and tokenDef.requiresBOL
+            return true
+        if not .isActiveCall(tokenDef)
+            return true
+        return false    
+
+    def _getTokenMethod(which as String) as  MethodInfo? 
+        """
+        Get the method for token (On<which>) from cache if there else 
+        reflect and cache it.
+        """ 
+        if not _onTokenTypeCache.containsKey(which) # not already in methods cache
+            methName = 'On' + which                 
+            meth = .getType.getMethod(methName)     
+            _onTokenTypeCache[which] = meth         
+        else
+            meth = _onTokenTypeCache[which]
+        return meth
+        
+    def _tokenPostProcess(meth as MethodInfo,  tok as IToken?) as IToken?
+        """
+        Invoke any tokenMethod and return adjusted token or first token in any provided
+        token chain (rest of chain queued).
+        nil token returned indicates token is skipped.
+        """
+
+        try
+            tok = meth.invoke(this, @[tok]) to IToken?
+        catch tie as TargetInvocationException
+            throw tie.innerException
+        if not tok
+            return nil  # token is to be skipped
+        retTok = tok
+        tok = tok.nextToken
+        while tok
+        # TODO: could probably make this more efficient by axing the queue and just checking for nextToken in this method
+            _tokenQueue.enqueue(tok)  # store any token chain returned by method call
+            tok = tok.nextToken
+        return retTok   
+
     def pushTokenDefs(defs as List<of TokenDef>)
         ensure
             _tokenDefs is defs