cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node ASTSetDirective.java Node.java SimpleNode.java

[jvanzyl]

jvanzyl     00/10/20 18:59:23

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        ASTSetDirective.java Node.java SimpleNode.java
  Log:
  - adding methods to give the line/col numbers of offending references
    in templates.
  
  Revision  Changes    Path
  1.3       +1 -3      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
  
  Index: ASTSetDirective.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ASTSetDirective.java      2000/10/21 01:36:49     1.2
  +++ ASTSetDirective.java      2000/10/21 01:59:22     1.3
  @@ -40,9 +40,7 @@
   
           if (right.value(context) == null)
           {
  -            Runtime.error(new ReferenceException(
  -                "#set: " + right.literal() + " is not a valid reference."));
  -            
  +            Runtime.error(new ReferenceException("#set", right));
               return false;
           }                
   
  
  
  
  1.4       +2 -0      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/Node.java
  
  Index: Node.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/Node.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Node.java 2000/10/21 01:36:50     1.3
  +++ Node.java 2000/10/21 01:59:22     1.4
  @@ -64,4 +64,6 @@
       public String literal();
       public void setInvalid();
       public boolean isInvalid();
  +    public int getLine();
  +    public int getColumn();
   }
  
  
  
  1.5       +10 -0     
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
  
  Index: SimpleNode.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleNode.java   2000/10/21 01:36:50     1.4
  +++ SimpleNode.java   2000/10/21 01:59:22     1.5
  @@ -225,5 +225,15 @@
       {
           return invalid;
       }        
  +
  +    public int getLine()
  +    {
  +        return first.beginLine;
  +    }
  +    
  +    public int getColumn()
  +    {
  +        return first.beginColumn;
  +    }        
   }