morten      01/07/31 02:13:13

  Added:       java/src/org/apache/xalan/xsltc/compiler VariableBase.java
                        VariableRefBase.java
  Log:
  Forgot to add these two in my last putback.
  PR:           none
  Obtained from:        n/a
  Submitted by: [EMAIL PROTECTED]
  Reviewed by:  [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.1                  
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableBase.java
  
  Index: VariableBase.java
  ===================================================================
  /*
   * @(#)$Id: VariableBase.java,v 1.1 2001/07/31 09:13:13 morten Exp $
   *
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xalan" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation and was
   * originally based on software copyright (c) 2001, Sun
   * Microsystems., http://www.sun.com.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * @author Jacek Ambroziak
   * @author Santiago Pericas-Geertsen
   * @author Morten Jorgensen
   * @author Erwin Bolwidt <[EMAIL PROTECTED]>
   * @author John Howard <[EMAIL PROTECTED]>
   *
   */
  
  package org.apache.xalan.xsltc.compiler;
  
  import java.util.Vector;
  
  import org.apache.xalan.xsltc.compiler.util.Type;
  import de.fub.bytecode.generic.Instruction;
  import de.fub.bytecode.generic.*;
  import de.fub.bytecode.classfile.Field;
  import org.apache.xalan.xsltc.compiler.util.*;
  import org.apache.xalan.xsltc.dom.Axis;
  
  class VariableBase extends TopLevelElement {
  
      protected QName       _name;            // The name of the variable.
      protected Type        _type;            // The type of this variable.
      protected boolean     _isLocal;         // True if the variable is local.
      protected LocalVariableGen _local;      // Reference to JVM variable
      protected Instruction _loadInstruction; // Instruction to load JVM 
variable
      protected Expression  _select;          // Reference to variable 
expression
      protected int         _stackIndex = -1; // Stack index relative to base 
ptr.
  
      // References to this variable (when local)
      protected Vector      _refs = new Vector(2); 
  
      // Used to make sure parameter field is not added twice
      protected boolean    _compiled = false;
  
      /**
       * Add a reference to this variable. Called by VariableRef when an
       * expression contains a reference to this variable.
       */
      public void addReference(VariableRefBase vref) {
        _refs.addElement(vref);
      }
  
      /**
       * Remove a reference to this variable. Called by VariableRef when this
       * variable goes out of scope.
       */
      public void removeReference(VariableRefBase vref) {
        _refs.remove(vref);
      }
  
      /**
       * Map this variable to a register
       */
      public void mapRegister(MethodGenerator methodGen) {
          if (_local == null) {
              final InstructionList il = methodGen.getInstructionList();
            String name = _name.getLocalPart(); // TODO: namespace ?
              name = name.replace('.', '_');
              name = name.replace('-', '_');
            final de.fub.bytecode.generic.Type varType = _type.toJCType();
              _local = methodGen.addLocalVariable2(name, varType, il.getEnd());
          }
      }
  
      /**
       * Remove the mapping of this variable to a register.
       * Called when we leave the AST scope of the variable's declaration
       */
      public void unmapRegister(MethodGenerator methodGen) {
        if (_refs.isEmpty()) {
            _local.setEnd(methodGen.getInstructionList().getEnd());
            methodGen.removeLocalVariable(_local);
            _refs = null;
            _local = null;
        }
      }
  
      /**
       * Returns a handle to the instruction for loading the value of this
       * variable onto the JVM stack.
       */
      public Instruction loadInstruction() {
        final Instruction instr = _loadInstruction;
        if (_loadInstruction == null) 
            _loadInstruction = _type.LOAD(_local.getIndex());
        return _loadInstruction;
      }
  
      /**
       * Returns the expression from this variable's select attribute (if any)
       */
      public Expression getExpression() {
        return(_select);
      }
  
      /**
       * Display variable as single string
       */
      public String toString() {
        return("variable("+_name+")");
      }
  
      /**
       * Display variable in a full AST dump
       */
      public void display(int indent) {
        indent(indent);
        System.out.println("Variable " + _name);
        if (_select != null) { 
            indent(indent + IndentIncrement);
            System.out.println("select " + _select.toString());
        }
        displayContents(indent + IndentIncrement);
      }
  
      /**
       * Returns the type of the variable
       */
      public Type getType() {
        return _type;
      }
  
      /**
       * Returns the name of the variable
       */
      public QName getName() {
        return _name;
      }
  
      /**
       * Returns the true if the variable is local
       */
      public boolean isLocal() {
        return _isLocal;
      }
  
  }
  
  
  
  1.1                  
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java
  
  Index: VariableRefBase.java
  ===================================================================
  /*
   * @(#)$Id: VariableRefBase.java,v 1.1 2001/07/31 09:13:13 morten Exp $
   *
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xalan" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation and was
   * originally based on software copyright (c) 2001, Sun
   * Microsystems., http://www.sun.com.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * @author Morten Jorgensen
   *
   */
  
  package org.apache.xalan.xsltc.compiler;
  
  import org.apache.xalan.xsltc.compiler.util.Type;
  import de.fub.bytecode.generic.*;
  import org.apache.xalan.xsltc.compiler.util.*;
  
  class VariableRefBase extends Expression {
  
      protected final VariableBase _variable;
  
      public VariableRefBase(VariableBase variable) {
        _variable = variable;
        variable.addReference(this);
      }
  
      public VariableBase getVariable() {
        return(_variable);
      }
  
      public String toString() {
        return "variable-ref(" + _variable.getName() + ')';
      }
  
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to