[Nice-commit] Nice/src/bossa/parser JavaccParser.java,1.1,1.2 Parser.jj,1.246,1.247

[Arjan B. <ar...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24939/F:/nice/src/bossa/parser

Modified Files:
	JavaccParser.java Parser.jj 
Log Message:
Minor: reduced code duplication.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.246
retrieving revision 1.247
diff -C2 -d -r1.246 -r1.247
*** Parser.jj	29 Jun 2004 15:13:48 -0000	1.246
--- Parser.jj	1 Jul 2004 10:46:18 -0000	1.247
***************
*** 61,65 ****
    }
  
!   private static Location makeLocation(Token t)
    {
      return Location.make(t.beginLine, t.beginColumn, t.endLine, t.endColumn);
--- 61,65 ----
    }
  
!   static Location makeLocation(Token t)
    {
      return Location.make(t.beginLine, t.beginColumn, t.endLine, t.endColumn);

Index: JavaccParser.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/JavaccParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JavaccParser.java	30 Jun 2004 14:12:37 -0000	1.1
--- JavaccParser.java	1 Jul 2004 10:46:18 -0000	1.2
***************
*** 110,114 ****
            token = token.next;
  
!         throw User.error(Location.make(token.beginLine, token.beginColumn),
                           removeLocation(e.getMessage()));
        }
--- 110,114 ----
            token = token.next;
  
!         throw User.error(Parser.makeLocation(token),
                           removeLocation(e.getMessage()));
        }