[Nice-commit] Nice/src/bossa/parser Parser.jj,1.259,1.260

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

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

Modified Files:
	Parser.jj 
Log Message:
Converted constantExp subclasses to Nice code.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.259
retrieving revision 1.260
diff -C2 -d -r1.259 -r1.260
*** Parser.jj	13 Aug 2004 12:52:11 -0000	1.259
--- Parser.jj	2 Sep 2004 15:46:32 -0000	1.260
***************
*** 525,529 ****
  {
    name = doted_array_string()
!   { return new TypeConstantExp(name); }
  }
  
--- 525,529 ----
  {
    name = doted_array_string()
!   { return bossa.syntax.dispatch.createTypeConstantExp(name); }
  }
  
***************
*** 1634,1638 ****
  {
    t="null" 
!   { return NullExp.create(makeLocation(t)); }
  }
  
--- 1634,1638 ----
  {
    t="null" 
!   { return bossa.syntax.dispatch.createNullExp(makeLocation(t)); }
  }
  
***************
*** 1677,1693 ****
  }
  
! StringConstantExp stringConstantExp():
  { String s; }
  {
    s=rawString()
!   { return new StringConstantExp(s); }
  }
  
! StringConstantExp multiLineStringExp():
  { Token t; String s; }
  {
    t = <MULTILINESTRING>
    { s = t.image.substring(3, t.image.length() - 3);
!     return new StringConstantExp(s, true);
    }
  }
--- 1677,1693 ----
  }
  
! ConstantExp stringConstantExp():
  { String s; }
  {
    s=rawString()
!   { return bossa.syntax.dispatch.createStringConstantExp(s); }
  }
  
! ConstantExp multiLineStringExp():
  { Token t; String s; }
  {
    t = <MULTILINESTRING>
    { s = t.image.substring(3, t.image.length() - 3);
!     return bossa.syntax.dispatch.createStringConstantExp(s, true);
    }
  }
***************
*** 2119,2123 ****
  			new LocatedString("0", makeLocation(t)));
  		if (e2 == null)
! 		  e2 = NullExp.create(makeLocation(t));
  		e1=bossa.syntax.dispatch.createCallExp(symb(t),e1,e2); 
  	}
--- 2119,2123 ----
  			new LocatedString("0", makeLocation(t)));
  		if (e2 == null)
! 		  e2 = bossa.syntax.dispatch.createNullExp(makeLocation(t));
  		e1=bossa.syntax.dispatch.createCallExp(symb(t),e1,e2); 
  	}