[Nice-commit] Nice/src/bossa/syntax Arguments.java,1.20,1.21 FormalParameters.java,1.32,1.33

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv16950/F:/nice/src/bossa/syntax

Modified Files:
	Arguments.java FormalParameters.java 
Log Message:
fixed NPE(and some potential others) in error reporting of named arguments.

Index: Arguments.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Arguments.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Arguments.java	21 Nov 2003 08:09:58 -0000	1.20
--- Arguments.java	22 Nov 2003 16:37:39 -0000	1.21
***************
*** 253,257 ****
        { 
  	String s = arguments[i].name.toString();
! 	if (!parameters.hasMatchFor(s))
  	  res.add(s);
        }
--- 253,257 ----
        { 
  	String s = arguments[i].name.toString();
! 	if (parameters == null || !parameters.hasMatchFor(s))
  	  res.add(s);
        }

Index: FormalParameters.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/FormalParameters.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** FormalParameters.java	11 Aug 2003 19:31:31 -0000	1.32
--- FormalParameters.java	22 Nov 2003 16:37:39 -0000	1.33
***************
*** 17,20 ****
--- 17,21 ----
  import java.util.Iterator;
  import java.util.LinkedList;
+ import java.util.ArrayList;
  import java.util.List;
  
***************
*** 457,461 ****
    public boolean hasMatchFor(String s)
    {
!     for (int i = 0; i<parameters.length; i++)
        if (parameters[i].match(s))
  	return true;
--- 458,462 ----
    public boolean hasMatchFor(String s)
    {
!     for (int i = 0; i<size; i++)
        if (parameters[i].match(s))
  	return true;
***************
*** 475,479 ****
    public Iterator iterator()
    {
!     return Arrays.asList(parameters).iterator();
    }
  
--- 476,483 ----
    public Iterator iterator()
    {
!     if (parameters != null)
!       return Arrays.asList(parameters).iterator();
!    
!     return new ArrayList().iterator();
    }
  
***************
*** 481,485 ****
    {
      LinkedList res = new LinkedList();
!     for(int i = 0; i < parameters.length; i++) 
        {
          Parameter param = parameters[i];
--- 485,489 ----
    {
      LinkedList res = new LinkedList();
!     for(int i = 0; i < size; i++) 
        {
          Parameter param = parameters[i];
***************
*** 495,499 ****
    {
      LinkedList res = new LinkedList();
!     for(int i = 0; i < parameters.length; i++) 
        {
          Parameter param = parameters[i];
--- 499,503 ----
    {
      LinkedList res = new LinkedList();
!     for(int i = 0; i < size; i++) 
        {
          Parameter param = parameters[i];