[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby RubyNumberRule.java,NONE,1.1 RubyCodeScanner.java,1.11,1.12

[Kyle S. <kyl...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32763/src/org/rubypeople/rdt/internal/ui/text/ruby

Modified Files:
	RubyCodeScanner.java 
Added Files:
	RubyNumberRule.java 
Log Message:
Fixed syntax highlighting of fixnums

--- NEW FILE: RubyNumberRule.java ---
package org.rubypeople.rdt.internal.ui.text.ruby;

import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.NumberRule;
import org.eclipse.jface.text.rules.Token;

public class RubyNumberRule extends NumberRule {

	public RubyNumberRule(IToken token){
		super(token);
	}
	
	/*
	 * @see IRule#evaluate(ICharacterScanner)
	 */
	public IToken evaluate(ICharacterScanner scanner) {
		int c= scanner.read();
		if (Character.isDigit((char)c)) {
			scanner.unread();
			scanner.unread();
			c = scanner.read();
			if ( Character.isLetter((char)c)){
				do {
					c= scanner.read();
				} while (Character.isDigit((char) c));
				scanner.unread();
				return Token.UNDEFINED;
			}
			c = scanner.read();
			if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {
				do {
					c= scanner.read();
				} while (Character.isDigit((char) c));
				if ( Character.isLetter((char)c) ){
					scanner.unread();
					return Token.UNDEFINED;
				}
				scanner.unread();
				return fToken;
			}
		}

		scanner.unread();
		return Token.UNDEFINED;
	}
	
}

Index: RubyCodeScanner.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyCodeScanner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RubyCodeScanner.java	18 Feb 2006 17:29:33 -0000	1.11
--- RubyCodeScanner.java	8 Apr 2006 06:17:58 -0000	1.12
***************
*** 54,58 ****
  
          IToken fixnumToken = getToken(IRubyColorConstants.RUBY_FIXNUM);
!         rules.add(new NumberRule(fixnumToken));
  
          rules.add(new SymbolRule(getToken(IRubyColorConstants.RUBY_SYMBOL)));
--- 54,58 ----
  
          IToken fixnumToken = getToken(IRubyColorConstants.RUBY_FIXNUM);
!         rules.add(new RubyNumberRule(fixnumToken));
  
          rules.add(new SymbolRule(getToken(IRubyColorConstants.RUBY_SYMBOL)));