Changeset 3566


Ignore:
Timestamp:
Mar 25, 2008, 4:14:44 PM (13 years ago)
Author:
yura
Message:
  • Renamings in org.refal.plus.rfpdt.core.
Location:
devel-tools/trunk/eclipse
Files:
1 added
77 edited
16 moved

Legend:

Unmodified
Added
Removed
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/META-INF/MANIFEST.MF

    r3557 r3566  
    1515Eclipse-LazyStart: true
    1616Bundle-RequiredExecutionEnvironment: J2SE-1.5
    17 Export-Package: org.refal.rfpdt.comp,
    18  org.refal.rfpdt.comp.ast,
    19  org.refal.rfpdt.comp.parse,
     17Export-Package: org.refal.rfpdt.ast,
     18 org.refal.rfpdt.compiler,
    2019 org.refal.rfpdt.core,
    21  org.refal.rfpdt.launching
     20 org.refal.rfpdt.launching,
     21 org.refal.rfpdt.parser
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstAlt.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstAlt extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstCall.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstCall extends AstTerm implements IHoverInfo {
    66    /** May be <code>null</code>! */
    77    public final AstName name;
    8     public final AstExp arg;
     8    public final AstExpr arg;
    99    /** May be <code>null</code>! */
    1010    public AstFuncDecl funcDecl = null;
    1111
    12     public AstCall (SrcPosition pos, AstName name, AstExp arg) {
     12    public AstCall (SrcPosition pos, AstName name, AstExpr arg) {
    1313        super(pos);
    1414        assert arg != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstCharSymbol.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstCharSymbol extends AstSymbol {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstConstBinding.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstConstBinding extends AstDecl {
    6     public final AstExp exp;
     6    public final AstExpr exp;
    77
    8     public AstConstBinding (SrcPosition pos, AstName name, boolean isPublic, AstExp exp) {
     8    public AstConstBinding (SrcPosition pos, AstName name, boolean isPublic, AstExpr exp) {
    99        super(pos, name, isPublic);
    1010        assert exp != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstCut.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstCut extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstCutAll.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstCutAll extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstDecl.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33import java.util.ArrayList;
    44
    5 import org.refal.rfpdt.comp.SrcPosition;
     5import org.refal.rfpdt.compiler.SrcPosition;
    66
    77public abstract class AstDecl extends AstTopNode implements IHoverInfo {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstError.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstError extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstExp.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstExp extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFail.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstFail extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFence.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33import java.util.ArrayList;
    44
    5 import org.refal.rfpdt.comp.SrcPosition;
     5import org.refal.rfpdt.compiler.SrcPosition;
    66
    77public final class AstFence extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFormat.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstFormat extends AstStatement {
    6     public final AstExp exp;
     6    public final AstExpr exp;
    77
    8     public AstFormat (SrcPosition pos, AstExp exp) {
     8    public AstFormat (SrcPosition pos, AstExpr exp) {
    99        super(pos);
    1010        assert exp != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFuncDecl.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstFuncDecl extends AstDecl {
     
    1313
    1414    public final RetMode retMode;
    15     public final AstExp inFormat;
    16     public final AstExp outFormat;
     15    public final AstExpr inFormat;
     16    public final AstExpr outFormat;
    1717    /** May be <code>null</code>! */
    1818    public AstTopNode funcDef = null;
    1919
    20     public AstFuncDecl (SrcPosition pos, AstName name, boolean isPublic, RetMode retMode, AstExp inFormat,
    21             AstExp outFormat) {
     20    public AstFuncDecl (SrcPosition pos, AstName name, boolean isPublic, RetMode retMode, AstExpr inFormat,
     21            AstExpr outFormat) {
    2222        super(pos, name, isPublic);
    2323        assert retMode != null && inFormat != null && outFormat != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstFuncDef.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstFuncDef extends AstTopNode implements IHoverInfo {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstImplem.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstImplem extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstInterf.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstInterf extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstIter.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstIter extends AstStatement {
    66    public final AstSentence sentence;
    7     public final AstExp target;
     7    public final AstExpr target;
    88
    9     public AstIter (SrcPosition pos, AstSentence sentence, AstExp target) {
     9    public AstIter (SrcPosition pos, AstSentence sentence, AstExpr target) {
    1010        super(pos);
    1111        assert sentence != null && target != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstName.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstName extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNative.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstNative extends AstTopNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNode.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public abstract class AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNot.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstNot extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstNumberSymbol.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33import java.math.BigInteger;
    44
    5 import org.refal.rfpdt.comp.SrcPosition;
     5import org.refal.rfpdt.compiler.SrcPosition;
    66
    77public final class AstNumberSymbol extends AstSymbol {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstObjDecl.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstObjDecl extends AstDecl {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstParen.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstParen extends AstTerm {
    6     public final AstExp exp;
     6    public final AstExpr exp;
    77
    8     public AstParen (SrcPosition pos, AstExp exp) {
     8    public AstParen (SrcPosition pos, AstExpr exp) {
    99        super(pos);
    1010        assert exp != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstPattern.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstPattern extends AstStatement {
     
    1313
    1414    public final MatchDir dir;
    15     public final AstExp exp;
     15    public final AstExpr exp;
    1616
    17     public AstPattern (SrcPosition pos, MatchDir dir, AstExp exp) {
     17    public AstPattern (SrcPosition pos, MatchDir dir, AstExpr exp) {
    1818        super(pos);
    1919        assert dir != null && exp != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstRef.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstRef extends AstTerm implements IHoverInfo {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstResult.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstResult extends AstStatement {
    6     public final AstExp exp;
     6    public final AstExpr exp;
    77
    8     public AstResult (SrcPosition pos, AstExp exp) {
     8    public AstResult (SrcPosition pos, AstExpr exp) {
    99        super(pos);
    1010        assert exp != null;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstSentence.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstSentence extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstStatement.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public abstract class AstStatement extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstSymbol.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public abstract class AstSymbol extends AstTerm {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstTerm.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public abstract class AstTerm extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstTopNode.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public abstract class AstTopNode extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstTraceAll.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstTraceAll extends AstTopNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstTrap.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstTrap extends AstStatement {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstUse.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstUse extends AstNode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstVar.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33import java.util.ArrayList;
    44
    5 import org.refal.rfpdt.comp.SrcPosition;
     5import org.refal.rfpdt.compiler.SrcPosition;
    66
    77public final class AstVar extends AstTerm {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/AstWordSymbol.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    3 import org.refal.rfpdt.comp.SrcPosition;
     3import org.refal.rfpdt.compiler.SrcPosition;
    44
    55public final class AstWordSymbol extends AstSymbol {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/ExpVisitor.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface ExpVisitor {
     
    66    void visit (AstCharSymbol astCharSymbol);
    77
    8     void visit (AstExp astExp);
     8    void visit (AstExpr astExp);
    99
    1010    void visit (AstNumberSymbol astNumberSymbol);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/ExpVisitorWithEnv.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface ExpVisitorWithEnv<E> {
     
    66    void visit (AstCharSymbol astCharSymbol, E e);
    77
    8     void visit (AstExp astExp, E e);
     8    void visit (AstExpr astExp, E e);
    99
    1010    void visit (AstNumberSymbol astNumberSymbol, E e);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/IHoverInfo.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface IHoverInfo {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/ImageBuilder.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public final class ImageBuilder implements ProgramVisitor, SentenceVisitor, ExpVisitor {
     
    187187    }
    188188
    189     public void visit (AstExp astExp) {
     189    public void visit (AstExpr astExp) {
    190190        for (AstTerm term : astExp.termList)
    191191            term.accept(this);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/ProgramVisitor.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface ProgramVisitor {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/ProgramVisitorWithEnv.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface ProgramVisitorWithEnv<E> {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/Searcher.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33import java.util.ArrayList;
     
    182182    }
    183183
    184     public void visit (AstExp astExp) {
     184    public void visit (AstExpr astExp) {
    185185        if (!check(astExp))
    186186            return;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/SentenceVisitor.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface SentenceVisitor {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/ast/SentenceVisitorWithEnv.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.ast;
     1package org.refal.rfpdt.ast;
    22
    33public interface SentenceVisitorWithEnv<E> {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/AstEnvironment.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.ArrayList;
    44
    5 import org.refal.rfpdt.comp.ast.AstDecl;
    6 import org.refal.rfpdt.comp.ast.AstImplem;
    7 import org.refal.rfpdt.comp.ast.AstInterf;
    8 import org.refal.rfpdt.comp.ast.AstTopNode;
    9 import org.refal.rfpdt.comp.parse.RfpParser;
     5import org.refal.rfpdt.ast.AstDecl;
     6import org.refal.rfpdt.ast.AstImplem;
     7import org.refal.rfpdt.ast.AstInterf;
     8import org.refal.rfpdt.ast.AstTopNode;
     9import org.refal.rfpdt.parser.RfpParser;
    1010
    1111public class AstEnvironment {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/Checker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    3 import org.refal.rfpdt.comp.ast.AstImplem;
     3import org.refal.rfpdt.ast.AstImplem;
    44
    55public class Checker {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/CompilerEnvironment.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.io.Reader;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/ExpChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
    2 
    3 import org.refal.rfpdt.comp.ast.AstAlt;
    4 import org.refal.rfpdt.comp.ast.AstCall;
    5 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    6 import org.refal.rfpdt.comp.ast.AstConstBinding;
    7 import org.refal.rfpdt.comp.ast.AstCut;
    8 import org.refal.rfpdt.comp.ast.AstCutAll;
    9 import org.refal.rfpdt.comp.ast.AstError;
    10 import org.refal.rfpdt.comp.ast.AstExp;
    11 import org.refal.rfpdt.comp.ast.AstFail;
    12 import org.refal.rfpdt.comp.ast.AstFence;
    13 import org.refal.rfpdt.comp.ast.AstFormat;
    14 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    15 import org.refal.rfpdt.comp.ast.AstFuncDef;
    16 import org.refal.rfpdt.comp.ast.AstImplem;
    17 import org.refal.rfpdt.comp.ast.AstInterf;
    18 import org.refal.rfpdt.comp.ast.AstIter;
    19 import org.refal.rfpdt.comp.ast.AstNative;
    20 import org.refal.rfpdt.comp.ast.AstNot;
    21 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    22 import org.refal.rfpdt.comp.ast.AstObjDecl;
    23 import org.refal.rfpdt.comp.ast.AstParen;
    24 import org.refal.rfpdt.comp.ast.AstPattern;
    25 import org.refal.rfpdt.comp.ast.AstRef;
    26 import org.refal.rfpdt.comp.ast.AstResult;
    27 import org.refal.rfpdt.comp.ast.AstSentence;
    28 import org.refal.rfpdt.comp.ast.AstStatement;
    29 import org.refal.rfpdt.comp.ast.AstTerm;
    30 import org.refal.rfpdt.comp.ast.AstTopNode;
    31 import org.refal.rfpdt.comp.ast.AstTraceAll;
    32 import org.refal.rfpdt.comp.ast.AstTrap;
    33 import org.refal.rfpdt.comp.ast.AstUse;
    34 import org.refal.rfpdt.comp.ast.AstVar;
    35 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    36 import org.refal.rfpdt.comp.ast.ExpVisitorWithEnv;
    37 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    38 import org.refal.rfpdt.comp.ast.SentenceVisitor;
     1package org.refal.rfpdt.compiler;
     2
     3import org.refal.rfpdt.ast.AstAlt;
     4import org.refal.rfpdt.ast.AstCall;
     5import org.refal.rfpdt.ast.AstCharSymbol;
     6import org.refal.rfpdt.ast.AstConstBinding;
     7import org.refal.rfpdt.ast.AstCut;
     8import org.refal.rfpdt.ast.AstCutAll;
     9import org.refal.rfpdt.ast.AstError;
     10import org.refal.rfpdt.ast.AstExpr;
     11import org.refal.rfpdt.ast.AstFail;
     12import org.refal.rfpdt.ast.AstFence;
     13import org.refal.rfpdt.ast.AstFormat;
     14import org.refal.rfpdt.ast.AstFuncDecl;
     15import org.refal.rfpdt.ast.AstFuncDef;
     16import org.refal.rfpdt.ast.AstImplem;
     17import org.refal.rfpdt.ast.AstInterf;
     18import org.refal.rfpdt.ast.AstIter;
     19import org.refal.rfpdt.ast.AstNative;
     20import org.refal.rfpdt.ast.AstNot;
     21import org.refal.rfpdt.ast.AstNumberSymbol;
     22import org.refal.rfpdt.ast.AstObjDecl;
     23import org.refal.rfpdt.ast.AstParen;
     24import org.refal.rfpdt.ast.AstPattern;
     25import org.refal.rfpdt.ast.AstRef;
     26import org.refal.rfpdt.ast.AstResult;
     27import org.refal.rfpdt.ast.AstSentence;
     28import org.refal.rfpdt.ast.AstStatement;
     29import org.refal.rfpdt.ast.AstTerm;
     30import org.refal.rfpdt.ast.AstTopNode;
     31import org.refal.rfpdt.ast.AstTraceAll;
     32import org.refal.rfpdt.ast.AstTrap;
     33import org.refal.rfpdt.ast.AstUse;
     34import org.refal.rfpdt.ast.AstVar;
     35import org.refal.rfpdt.ast.AstWordSymbol;
     36import org.refal.rfpdt.ast.ExpVisitorWithEnv;
     37import org.refal.rfpdt.ast.ProgramVisitor;
     38import org.refal.rfpdt.ast.SentenceVisitor;
    3939
    4040public class ExpChecker implements ProgramVisitor, SentenceVisitor {
     
    6161        public void visit (AstCharSymbol astCharSymbol, ContainerWithVar e) {}
    6262
    63         public void visit (AstExp astExp, ContainerWithVar e) {
     63        public void visit (AstExpr astExp, ContainerWithVar e) {
    6464            ContainerWithVar e1 = new ContainerWithVar();
    6565            for (AstTerm astTerm : astExp.termList)
     
    102102        public void visit (AstCharSymbol astCharSymbol, Container e) {}
    103103
    104         public void visit (AstExp astExp, Container e) {
     104        public void visit (AstExpr astExp, Container e) {
    105105            for (AstTerm astTerm : astExp.termList)
    106106                astTerm.accept(this, e);
     
    132132        public void visit (AstCharSymbol astCharSymbol, Container e) {}
    133133
    134         public void visit (AstExp astExp, Container e) {
     134        public void visit (AstExpr astExp, Container e) {
    135135            for (AstTerm astTerm : astExp.termList)
    136136                astTerm.accept(this, e);
     
    160160    }
    161161
    162     private void checkFormat (AstExp astExp) {
     162    private void checkFormat (AstExpr astExp) {
    163163        ContainerWithVar e = new ContainerWithVar();
    164164        astExp.accept(new FormatChecker(), e);
     
    166166    }
    167167
    168     private void checkPattern (AstExp astExp) {
     168    private void checkPattern (AstExpr astExp) {
    169169        Container e = new Container();
    170170        astExp.accept(new PatternChecker(), e);
     
    172172    }
    173173
    174     private void checkResult (AstExp astExp) {
     174    private void checkResult (AstExpr astExp) {
    175175        Container e = new Container();
    176176        astExp.accept(new ResultChecker(), e);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/FenceAndCutChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.ArrayList;
    44import java.util.Stack;
    55
    6 import org.refal.rfpdt.comp.ast.AstAlt;
    7 import org.refal.rfpdt.comp.ast.AstConstBinding;
    8 import org.refal.rfpdt.comp.ast.AstCut;
    9 import org.refal.rfpdt.comp.ast.AstCutAll;
    10 import org.refal.rfpdt.comp.ast.AstError;
    11 import org.refal.rfpdt.comp.ast.AstFail;
    12 import org.refal.rfpdt.comp.ast.AstFence;
    13 import org.refal.rfpdt.comp.ast.AstFormat;
    14 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    15 import org.refal.rfpdt.comp.ast.AstFuncDef;
    16 import org.refal.rfpdt.comp.ast.AstImplem;
    17 import org.refal.rfpdt.comp.ast.AstInterf;
    18 import org.refal.rfpdt.comp.ast.AstIter;
    19 import org.refal.rfpdt.comp.ast.AstNative;
    20 import org.refal.rfpdt.comp.ast.AstNode;
    21 import org.refal.rfpdt.comp.ast.AstNot;
    22 import org.refal.rfpdt.comp.ast.AstObjDecl;
    23 import org.refal.rfpdt.comp.ast.AstPattern;
    24 import org.refal.rfpdt.comp.ast.AstResult;
    25 import org.refal.rfpdt.comp.ast.AstSentence;
    26 import org.refal.rfpdt.comp.ast.AstStatement;
    27 import org.refal.rfpdt.comp.ast.AstTopNode;
    28 import org.refal.rfpdt.comp.ast.AstTraceAll;
    29 import org.refal.rfpdt.comp.ast.AstTrap;
    30 import org.refal.rfpdt.comp.ast.AstUse;
    31 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    32 import org.refal.rfpdt.comp.ast.SentenceVisitorWithEnv;
     6import org.refal.rfpdt.ast.AstAlt;
     7import org.refal.rfpdt.ast.AstConstBinding;
     8import org.refal.rfpdt.ast.AstCut;
     9import org.refal.rfpdt.ast.AstCutAll;
     10import org.refal.rfpdt.ast.AstError;
     11import org.refal.rfpdt.ast.AstFail;
     12import org.refal.rfpdt.ast.AstFence;
     13import org.refal.rfpdt.ast.AstFormat;
     14import org.refal.rfpdt.ast.AstFuncDecl;
     15import org.refal.rfpdt.ast.AstFuncDef;
     16import org.refal.rfpdt.ast.AstImplem;
     17import org.refal.rfpdt.ast.AstInterf;
     18import org.refal.rfpdt.ast.AstIter;
     19import org.refal.rfpdt.ast.AstNative;
     20import org.refal.rfpdt.ast.AstNode;
     21import org.refal.rfpdt.ast.AstNot;
     22import org.refal.rfpdt.ast.AstObjDecl;
     23import org.refal.rfpdt.ast.AstPattern;
     24import org.refal.rfpdt.ast.AstResult;
     25import org.refal.rfpdt.ast.AstSentence;
     26import org.refal.rfpdt.ast.AstStatement;
     27import org.refal.rfpdt.ast.AstTopNode;
     28import org.refal.rfpdt.ast.AstTraceAll;
     29import org.refal.rfpdt.ast.AstTrap;
     30import org.refal.rfpdt.ast.AstUse;
     31import org.refal.rfpdt.ast.ProgramVisitor;
     32import org.refal.rfpdt.ast.SentenceVisitorWithEnv;
    3333
    3434public final class FenceAndCutChecker implements ProgramVisitor, SentenceVisitorWithEnv<Stack<AstFence>> {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/FormatChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
    2 
    3 import org.refal.rfpdt.comp.ast.AstAlt;
    4 import org.refal.rfpdt.comp.ast.AstCall;
    5 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    6 import org.refal.rfpdt.comp.ast.AstConstBinding;
    7 import org.refal.rfpdt.comp.ast.AstCut;
    8 import org.refal.rfpdt.comp.ast.AstCutAll;
    9 import org.refal.rfpdt.comp.ast.AstError;
    10 import org.refal.rfpdt.comp.ast.AstExp;
    11 import org.refal.rfpdt.comp.ast.AstFail;
    12 import org.refal.rfpdt.comp.ast.AstFence;
    13 import org.refal.rfpdt.comp.ast.AstFormat;
    14 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    15 import org.refal.rfpdt.comp.ast.AstFuncDef;
    16 import org.refal.rfpdt.comp.ast.AstImplem;
    17 import org.refal.rfpdt.comp.ast.AstInterf;
    18 import org.refal.rfpdt.comp.ast.AstIter;
    19 import org.refal.rfpdt.comp.ast.AstName;
    20 import org.refal.rfpdt.comp.ast.AstNative;
    21 import org.refal.rfpdt.comp.ast.AstNot;
    22 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    23 import org.refal.rfpdt.comp.ast.AstObjDecl;
    24 import org.refal.rfpdt.comp.ast.AstParen;
    25 import org.refal.rfpdt.comp.ast.AstPattern;
    26 import org.refal.rfpdt.comp.ast.AstRef;
    27 import org.refal.rfpdt.comp.ast.AstResult;
    28 import org.refal.rfpdt.comp.ast.AstSentence;
    29 import org.refal.rfpdt.comp.ast.AstTerm;
    30 import org.refal.rfpdt.comp.ast.AstTopNode;
    31 import org.refal.rfpdt.comp.ast.AstTraceAll;
    32 import org.refal.rfpdt.comp.ast.AstTrap;
    33 import org.refal.rfpdt.comp.ast.AstUse;
    34 import org.refal.rfpdt.comp.ast.AstVar;
    35 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    36 import org.refal.rfpdt.comp.ast.ExpVisitor;
    37 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    38 import org.refal.rfpdt.comp.ast.SentenceVisitor;
    39 import org.refal.rfpdt.comp.ast.SentenceVisitorWithEnv;
     1package org.refal.rfpdt.compiler;
     2
     3import org.refal.rfpdt.ast.AstAlt;
     4import org.refal.rfpdt.ast.AstCall;
     5import org.refal.rfpdt.ast.AstCharSymbol;
     6import org.refal.rfpdt.ast.AstConstBinding;
     7import org.refal.rfpdt.ast.AstCut;
     8import org.refal.rfpdt.ast.AstCutAll;
     9import org.refal.rfpdt.ast.AstError;
     10import org.refal.rfpdt.ast.AstExpr;
     11import org.refal.rfpdt.ast.AstFail;
     12import org.refal.rfpdt.ast.AstFence;
     13import org.refal.rfpdt.ast.AstFormat;
     14import org.refal.rfpdt.ast.AstFuncDecl;
     15import org.refal.rfpdt.ast.AstFuncDef;
     16import org.refal.rfpdt.ast.AstImplem;
     17import org.refal.rfpdt.ast.AstInterf;
     18import org.refal.rfpdt.ast.AstIter;
     19import org.refal.rfpdt.ast.AstName;
     20import org.refal.rfpdt.ast.AstNative;
     21import org.refal.rfpdt.ast.AstNot;
     22import org.refal.rfpdt.ast.AstNumberSymbol;
     23import org.refal.rfpdt.ast.AstObjDecl;
     24import org.refal.rfpdt.ast.AstParen;
     25import org.refal.rfpdt.ast.AstPattern;
     26import org.refal.rfpdt.ast.AstRef;
     27import org.refal.rfpdt.ast.AstResult;
     28import org.refal.rfpdt.ast.AstSentence;
     29import org.refal.rfpdt.ast.AstTerm;
     30import org.refal.rfpdt.ast.AstTopNode;
     31import org.refal.rfpdt.ast.AstTraceAll;
     32import org.refal.rfpdt.ast.AstTrap;
     33import org.refal.rfpdt.ast.AstUse;
     34import org.refal.rfpdt.ast.AstVar;
     35import org.refal.rfpdt.ast.AstWordSymbol;
     36import org.refal.rfpdt.ast.ExpVisitor;
     37import org.refal.rfpdt.ast.ProgramVisitor;
     38import org.refal.rfpdt.ast.SentenceVisitor;
     39import org.refal.rfpdt.ast.SentenceVisitorWithEnv;
    4040
    4141public class FormatChecker implements ProgramVisitor, SentenceVisitor, SentenceVisitorWithEnv<FormatChecker.RefAstExp>,
    4242        ExpVisitor {
    4343    private static final class RefAstExp {
    44         public AstExp exp;
     44        public AstExpr exp;
    4545        public MsgCode msgCode;
    4646
     
    5050        }
    5151
    52         public RefAstExp (AstExp format, MsgCode msg) {
     52        public RefAstExp (AstExpr format, MsgCode msg) {
    5353            if (format.noError) {
    5454                exp = format;
     
    6767        }
    6868
    69         public void set (AstExp format, MsgCode msg) {
     69        public void set (AstExpr format, MsgCode msg) {
    7070            if (format.noError) {
    7171                exp = format;
     
    8383    private final MsgHandler msgHandler;
    8484
    85     private AstExp inFormat = null;
     85    private AstExpr inFormat = null;
    8686
    8787    private FormatChecker (final MsgHandler msgHandler) {
     
    8989    }
    9090
    91     private void covers (AstExp format, AstExp exp, MsgCode msg) {
     91    private void covers (AstExpr format, AstExpr exp, MsgCode msg) {
    9292        if ((format != null) && format.noError && exp.noError && !FormatMatcher.covers(format, exp))
    9393            msgHandler.send(exp.pos, msg);
     
    257257    public void visit (AstCharSymbol astCharSymbol) {}
    258258
    259     public void visit (AstExp astExp) {
     259    public void visit (AstExpr astExp) {
    260260        for (AstTerm astTerm : astExp.termList)
    261261            astTerm.accept(this);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/FormatMatcher.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.LinkedList;
    44
    5 import org.refal.rfpdt.comp.ast.AstCall;
    6 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    7 import org.refal.rfpdt.comp.ast.AstConstBinding;
    8 import org.refal.rfpdt.comp.ast.AstDecl;
    9 import org.refal.rfpdt.comp.ast.AstExp;
    10 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    11 import org.refal.rfpdt.comp.ast.AstParen;
    12 import org.refal.rfpdt.comp.ast.AstRef;
    13 import org.refal.rfpdt.comp.ast.AstSymbol;
    14 import org.refal.rfpdt.comp.ast.AstTerm;
    15 import org.refal.rfpdt.comp.ast.AstVar;
    16 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    17 import org.refal.rfpdt.comp.ast.ExpVisitor;
    18 import org.refal.rfpdt.comp.ast.ExpVisitorWithEnv;
    19 import org.refal.rfpdt.comp.ast.AstVar.VarType;
     5import org.refal.rfpdt.ast.AstCall;
     6import org.refal.rfpdt.ast.AstCharSymbol;
     7import org.refal.rfpdt.ast.AstConstBinding;
     8import org.refal.rfpdt.ast.AstDecl;
     9import org.refal.rfpdt.ast.AstExpr;
     10import org.refal.rfpdt.ast.AstNumberSymbol;
     11import org.refal.rfpdt.ast.AstParen;
     12import org.refal.rfpdt.ast.AstRef;
     13import org.refal.rfpdt.ast.AstSymbol;
     14import org.refal.rfpdt.ast.AstTerm;
     15import org.refal.rfpdt.ast.AstVar;
     16import org.refal.rfpdt.ast.AstWordSymbol;
     17import org.refal.rfpdt.ast.ExpVisitor;
     18import org.refal.rfpdt.ast.ExpVisitorWithEnv;
     19import org.refal.rfpdt.ast.AstVar.VarType;
    2020
    2121public final class FormatMatcher {
     
    3939    }
    4040
    41     public static boolean covers (AstExp format, AstExp exp) {
     41    public static boolean covers (AstExpr format, AstExpr exp) {
    4242        FormatMatcher matcher = new FormatMatcher(format, exp);
    4343        return matcher.match();
     
    156156    private final LinkedList<AstTerm> format;
    157157
    158     private FormatMatcher (AstExp format, AstExp exp) {
     158    private FormatMatcher (AstExpr format, AstExpr exp) {
    159159        this.format = new LinkedList<AstTerm>();
    160160        addToList(0, this.format, format.termList);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/ImportChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.LinkedHashSet;
    44
    5 import org.refal.rfpdt.comp.ast.AstImplem;
    6 import org.refal.rfpdt.comp.ast.AstName;
    7 import org.refal.rfpdt.comp.ast.AstUse;
     5import org.refal.rfpdt.ast.AstImplem;
     6import org.refal.rfpdt.ast.AstName;
     7import org.refal.rfpdt.ast.AstUse;
    88
    99public class ImportChecker {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/MsgCode.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33public enum MsgCode {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/MsgHandler.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33public abstract class MsgHandler {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/NameChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.ArrayList;
     
    55import java.util.HashSet;
    66
    7 import org.refal.rfpdt.comp.ast.AstAlt;
    8 import org.refal.rfpdt.comp.ast.AstCall;
    9 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    10 import org.refal.rfpdt.comp.ast.AstConstBinding;
    11 import org.refal.rfpdt.comp.ast.AstCut;
    12 import org.refal.rfpdt.comp.ast.AstCutAll;
    13 import org.refal.rfpdt.comp.ast.AstDecl;
    14 import org.refal.rfpdt.comp.ast.AstError;
    15 import org.refal.rfpdt.comp.ast.AstExp;
    16 import org.refal.rfpdt.comp.ast.AstFail;
    17 import org.refal.rfpdt.comp.ast.AstFence;
    18 import org.refal.rfpdt.comp.ast.AstFormat;
    19 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    20 import org.refal.rfpdt.comp.ast.AstFuncDef;
    21 import org.refal.rfpdt.comp.ast.AstImplem;
    22 import org.refal.rfpdt.comp.ast.AstInterf;
    23 import org.refal.rfpdt.comp.ast.AstIter;
    24 import org.refal.rfpdt.comp.ast.AstName;
    25 import org.refal.rfpdt.comp.ast.AstNative;
    26 import org.refal.rfpdt.comp.ast.AstNot;
    27 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    28 import org.refal.rfpdt.comp.ast.AstObjDecl;
    29 import org.refal.rfpdt.comp.ast.AstParen;
    30 import org.refal.rfpdt.comp.ast.AstPattern;
    31 import org.refal.rfpdt.comp.ast.AstRef;
    32 import org.refal.rfpdt.comp.ast.AstResult;
    33 import org.refal.rfpdt.comp.ast.AstSentence;
    34 import org.refal.rfpdt.comp.ast.AstStatement;
    35 import org.refal.rfpdt.comp.ast.AstTerm;
    36 import org.refal.rfpdt.comp.ast.AstTopNode;
    37 import org.refal.rfpdt.comp.ast.AstTraceAll;
    38 import org.refal.rfpdt.comp.ast.AstTrap;
    39 import org.refal.rfpdt.comp.ast.AstUse;
    40 import org.refal.rfpdt.comp.ast.AstVar;
    41 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    42 import org.refal.rfpdt.comp.ast.ExpVisitor;
    43 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    44 import org.refal.rfpdt.comp.ast.SentenceVisitor;
    45 import org.refal.rfpdt.comp.ast.AstObjDecl.ObjKind;
     7import org.refal.rfpdt.ast.AstAlt;
     8import org.refal.rfpdt.ast.AstCall;
     9import org.refal.rfpdt.ast.AstCharSymbol;
     10import org.refal.rfpdt.ast.AstConstBinding;
     11import org.refal.rfpdt.ast.AstCut;
     12import org.refal.rfpdt.ast.AstCutAll;
     13import org.refal.rfpdt.ast.AstDecl;
     14import org.refal.rfpdt.ast.AstError;
     15import org.refal.rfpdt.ast.AstExpr;
     16import org.refal.rfpdt.ast.AstFail;
     17import org.refal.rfpdt.ast.AstFence;
     18import org.refal.rfpdt.ast.AstFormat;
     19import org.refal.rfpdt.ast.AstFuncDecl;
     20import org.refal.rfpdt.ast.AstFuncDef;
     21import org.refal.rfpdt.ast.AstImplem;
     22import org.refal.rfpdt.ast.AstInterf;
     23import org.refal.rfpdt.ast.AstIter;
     24import org.refal.rfpdt.ast.AstName;
     25import org.refal.rfpdt.ast.AstNative;
     26import org.refal.rfpdt.ast.AstNot;
     27import org.refal.rfpdt.ast.AstNumberSymbol;
     28import org.refal.rfpdt.ast.AstObjDecl;
     29import org.refal.rfpdt.ast.AstParen;
     30import org.refal.rfpdt.ast.AstPattern;
     31import org.refal.rfpdt.ast.AstRef;
     32import org.refal.rfpdt.ast.AstResult;
     33import org.refal.rfpdt.ast.AstSentence;
     34import org.refal.rfpdt.ast.AstStatement;
     35import org.refal.rfpdt.ast.AstTerm;
     36import org.refal.rfpdt.ast.AstTopNode;
     37import org.refal.rfpdt.ast.AstTraceAll;
     38import org.refal.rfpdt.ast.AstTrap;
     39import org.refal.rfpdt.ast.AstUse;
     40import org.refal.rfpdt.ast.AstVar;
     41import org.refal.rfpdt.ast.AstWordSymbol;
     42import org.refal.rfpdt.ast.ExpVisitor;
     43import org.refal.rfpdt.ast.ProgramVisitor;
     44import org.refal.rfpdt.ast.SentenceVisitor;
     45import org.refal.rfpdt.ast.AstObjDecl.ObjKind;
    4646
    4747public final class NameChecker implements ProgramVisitor, SentenceVisitor, ExpVisitor {
     
    325325    public void visit (AstCharSymbol astCharSymbol) {}
    326326
    327     public void visit (AstExp astExp) {
     327    public void visit (AstExpr astExp) {
    328328        for (AstTerm astTerm : astExp.termList)
    329329            astTerm.accept(this);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/RfpResource.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33public final class RfpResource {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/SrcPosition.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33public final class SrcPosition {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/compiler/VariableScopeChecker.java

    r3562 r3566  
    1 package org.refal.rfpdt.comp;
     1package org.refal.rfpdt.compiler;
    22
    33import java.util.ArrayList;
     
    55import java.util.HashSet;
    66
    7 import org.refal.rfpdt.comp.ast.AstAlt;
    8 import org.refal.rfpdt.comp.ast.AstCall;
    9 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    10 import org.refal.rfpdt.comp.ast.AstConstBinding;
    11 import org.refal.rfpdt.comp.ast.AstCut;
    12 import org.refal.rfpdt.comp.ast.AstCutAll;
    13 import org.refal.rfpdt.comp.ast.AstError;
    14 import org.refal.rfpdt.comp.ast.AstExp;
    15 import org.refal.rfpdt.comp.ast.AstFail;
    16 import org.refal.rfpdt.comp.ast.AstFence;
    17 import org.refal.rfpdt.comp.ast.AstFormat;
    18 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    19 import org.refal.rfpdt.comp.ast.AstFuncDef;
    20 import org.refal.rfpdt.comp.ast.AstImplem;
    21 import org.refal.rfpdt.comp.ast.AstInterf;
    22 import org.refal.rfpdt.comp.ast.AstIter;
    23 import org.refal.rfpdt.comp.ast.AstNative;
    24 import org.refal.rfpdt.comp.ast.AstNot;
    25 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    26 import org.refal.rfpdt.comp.ast.AstObjDecl;
    27 import org.refal.rfpdt.comp.ast.AstParen;
    28 import org.refal.rfpdt.comp.ast.AstPattern;
    29 import org.refal.rfpdt.comp.ast.AstRef;
    30 import org.refal.rfpdt.comp.ast.AstResult;
    31 import org.refal.rfpdt.comp.ast.AstSentence;
    32 import org.refal.rfpdt.comp.ast.AstStatement;
    33 import org.refal.rfpdt.comp.ast.AstTerm;
    34 import org.refal.rfpdt.comp.ast.AstTopNode;
    35 import org.refal.rfpdt.comp.ast.AstTraceAll;
    36 import org.refal.rfpdt.comp.ast.AstTrap;
    37 import org.refal.rfpdt.comp.ast.AstUse;
    38 import org.refal.rfpdt.comp.ast.AstVar;
    39 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    40 import org.refal.rfpdt.comp.ast.ExpVisitorWithEnv;
    41 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    42 import org.refal.rfpdt.comp.ast.SentenceVisitorWithEnv;
     7import org.refal.rfpdt.ast.AstAlt;
     8import org.refal.rfpdt.ast.AstCall;
     9import org.refal.rfpdt.ast.AstCharSymbol;
     10import org.refal.rfpdt.ast.AstConstBinding;
     11import org.refal.rfpdt.ast.AstCut;
     12import org.refal.rfpdt.ast.AstCutAll;
     13import org.refal.rfpdt.ast.AstError;
     14import org.refal.rfpdt.ast.AstExpr;
     15import org.refal.rfpdt.ast.AstFail;
     16import org.refal.rfpdt.ast.AstFence;
     17import org.refal.rfpdt.ast.AstFormat;
     18import org.refal.rfpdt.ast.AstFuncDecl;
     19import org.refal.rfpdt.ast.AstFuncDef;
     20import org.refal.rfpdt.ast.AstImplem;
     21import org.refal.rfpdt.ast.AstInterf;
     22import org.refal.rfpdt.ast.AstIter;
     23import org.refal.rfpdt.ast.AstNative;
     24import org.refal.rfpdt.ast.AstNot;
     25import org.refal.rfpdt.ast.AstNumberSymbol;
     26import org.refal.rfpdt.ast.AstObjDecl;
     27import org.refal.rfpdt.ast.AstParen;
     28import org.refal.rfpdt.ast.AstPattern;
     29import org.refal.rfpdt.ast.AstRef;
     30import org.refal.rfpdt.ast.AstResult;
     31import org.refal.rfpdt.ast.AstSentence;
     32import org.refal.rfpdt.ast.AstStatement;
     33import org.refal.rfpdt.ast.AstTerm;
     34import org.refal.rfpdt.ast.AstTopNode;
     35import org.refal.rfpdt.ast.AstTraceAll;
     36import org.refal.rfpdt.ast.AstTrap;
     37import org.refal.rfpdt.ast.AstUse;
     38import org.refal.rfpdt.ast.AstVar;
     39import org.refal.rfpdt.ast.AstWordSymbol;
     40import org.refal.rfpdt.ast.ExpVisitorWithEnv;
     41import org.refal.rfpdt.ast.ProgramVisitor;
     42import org.refal.rfpdt.ast.SentenceVisitorWithEnv;
    4343
    4444public final class VariableScopeChecker implements ProgramVisitor,
     
    251251    public void visit (AstCharSymbol astCharSymbol, VarVisitor e) {}
    252252
    253     public void visit (AstExp astExp, VarVisitor e) {
     253    public void visit (AstExpr astExp, VarVisitor e) {
    254254        for (AstTerm astTerm : astExp.termList)
    255255            astTerm.accept(this, e);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RefalASGenerator.java

    r3508 r3566  
    55import org.refal.plus.Expr;
    66import org.refal.plus.Expr.Concatenator;
    7 import org.refal.rfpdt.comp.ast.AstAlt;
    8 import org.refal.rfpdt.comp.ast.AstCall;
    9 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    10 import org.refal.rfpdt.comp.ast.AstConstBinding;
    11 import org.refal.rfpdt.comp.ast.AstCut;
    12 import org.refal.rfpdt.comp.ast.AstCutAll;
    13 import org.refal.rfpdt.comp.ast.AstError;
    14 import org.refal.rfpdt.comp.ast.AstExp;
    15 import org.refal.rfpdt.comp.ast.AstFail;
    16 import org.refal.rfpdt.comp.ast.AstFence;
    17 import org.refal.rfpdt.comp.ast.AstFormat;
    18 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    19 import org.refal.rfpdt.comp.ast.AstFuncDef;
    20 import org.refal.rfpdt.comp.ast.AstImplem;
    21 import org.refal.rfpdt.comp.ast.AstInterf;
    22 import org.refal.rfpdt.comp.ast.AstIter;
    23 import org.refal.rfpdt.comp.ast.AstNative;
    24 import org.refal.rfpdt.comp.ast.AstNode;
    25 import org.refal.rfpdt.comp.ast.AstNot;
    26 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    27 import org.refal.rfpdt.comp.ast.AstObjDecl;
    28 import org.refal.rfpdt.comp.ast.AstParen;
    29 import org.refal.rfpdt.comp.ast.AstPattern;
    30 import org.refal.rfpdt.comp.ast.AstRef;
    31 import org.refal.rfpdt.comp.ast.AstResult;
    32 import org.refal.rfpdt.comp.ast.AstSentence;
    33 import org.refal.rfpdt.comp.ast.AstStatement;
    34 import org.refal.rfpdt.comp.ast.AstTerm;
    35 import org.refal.rfpdt.comp.ast.AstTopNode;
    36 import org.refal.rfpdt.comp.ast.AstTraceAll;
    37 import org.refal.rfpdt.comp.ast.AstTrap;
    38 import org.refal.rfpdt.comp.ast.AstUse;
    39 import org.refal.rfpdt.comp.ast.AstVar;
    40 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    41 import org.refal.rfpdt.comp.ast.ExpVisitorWithEnv;
    42 import org.refal.rfpdt.comp.ast.ProgramVisitorWithEnv;
    43 import org.refal.rfpdt.comp.ast.SentenceVisitorWithEnv;
     7import org.refal.rfpdt.ast.AstAlt;
     8import org.refal.rfpdt.ast.AstCall;
     9import org.refal.rfpdt.ast.AstCharSymbol;
     10import org.refal.rfpdt.ast.AstConstBinding;
     11import org.refal.rfpdt.ast.AstCut;
     12import org.refal.rfpdt.ast.AstCutAll;
     13import org.refal.rfpdt.ast.AstError;
     14import org.refal.rfpdt.ast.AstExpr;
     15import org.refal.rfpdt.ast.AstFail;
     16import org.refal.rfpdt.ast.AstFence;
     17import org.refal.rfpdt.ast.AstFormat;
     18import org.refal.rfpdt.ast.AstFuncDecl;
     19import org.refal.rfpdt.ast.AstFuncDef;
     20import org.refal.rfpdt.ast.AstImplem;
     21import org.refal.rfpdt.ast.AstInterf;
     22import org.refal.rfpdt.ast.AstIter;
     23import org.refal.rfpdt.ast.AstNative;
     24import org.refal.rfpdt.ast.AstNode;
     25import org.refal.rfpdt.ast.AstNot;
     26import org.refal.rfpdt.ast.AstNumberSymbol;
     27import org.refal.rfpdt.ast.AstObjDecl;
     28import org.refal.rfpdt.ast.AstParen;
     29import org.refal.rfpdt.ast.AstPattern;
     30import org.refal.rfpdt.ast.AstRef;
     31import org.refal.rfpdt.ast.AstResult;
     32import org.refal.rfpdt.ast.AstSentence;
     33import org.refal.rfpdt.ast.AstStatement;
     34import org.refal.rfpdt.ast.AstTerm;
     35import org.refal.rfpdt.ast.AstTopNode;
     36import org.refal.rfpdt.ast.AstTraceAll;
     37import org.refal.rfpdt.ast.AstTrap;
     38import org.refal.rfpdt.ast.AstUse;
     39import org.refal.rfpdt.ast.AstVar;
     40import org.refal.rfpdt.ast.AstWordSymbol;
     41import org.refal.rfpdt.ast.ExpVisitorWithEnv;
     42import org.refal.rfpdt.ast.ProgramVisitorWithEnv;
     43import org.refal.rfpdt.ast.SentenceVisitorWithEnv;
    4444
    4545public class RefalASGenerator implements ProgramVisitorWithEnv<Expr.Concatenator>,
     
    328328    }
    329329
    330     public void visit (AstExp astExp, Expr.Concatenator e) {
     330    public void visit (AstExpr astExp, Expr.Concatenator e) {
    331331        for (AstTerm astTerm : astExp.termList)
    332332            astTerm.accept(this, e);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/core/RfpBuilder.java

    r3524 r3566  
    3939import org.refal.plus.Result;
    4040import org.refal.plus.comp.FormatReader;
    41 import org.refal.rfpdt.comp.Checker;
    42 import org.refal.rfpdt.comp.CompilerEnvironment;
    43 import org.refal.rfpdt.comp.MsgCode;
    44 import org.refal.rfpdt.comp.MsgHandler;
    45 import org.refal.rfpdt.comp.SrcPosition;
    46 import org.refal.rfpdt.comp.ast.AstImplem;
     41import org.refal.rfpdt.ast.AstImplem;
     42import org.refal.rfpdt.compiler.Checker;
     43import org.refal.rfpdt.compiler.CompilerEnvironment;
     44import org.refal.rfpdt.compiler.MsgCode;
     45import org.refal.rfpdt.compiler.MsgHandler;
     46import org.refal.rfpdt.compiler.SrcPosition;
    4747
    4848public class RfpBuilder extends IncrementalProjectBuilder {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/RfpCharacter.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
     1package org.refal.rfpdt.parser;
    22
    33public final class RfpCharacter {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/RfpParser.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
    2 
    3 import static org.refal.rfpdt.comp.parse.TkFollowers.f_implem;
    4 import static org.refal.rfpdt.comp.parse.TkFollowers.f_interf;
    5 import static org.refal.rfpdt.comp.parse.TkStarters.s_alt;
    6 import static org.refal.rfpdt.comp.parse.TkStarters.s_const_binding;
    7 import static org.refal.rfpdt.comp.parse.TkStarters.s_const_decl;
    8 import static org.refal.rfpdt.comp.parse.TkStarters.s_decl;
    9 import static org.refal.rfpdt.comp.parse.TkStarters.s_decls;
    10 import static org.refal.rfpdt.comp.parse.TkStarters.s_directive;
    11 import static org.refal.rfpdt.comp.parse.TkStarters.s_directives;
    12 import static org.refal.rfpdt.comp.parse.TkStarters.s_exp;
    13 import static org.refal.rfpdt.comp.parse.TkStarters.s_exp_head;
    14 import static org.refal.rfpdt.comp.parse.TkStarters.s_func_decl;
    15 import static org.refal.rfpdt.comp.parse.TkStarters.s_func_def;
    16 import static org.refal.rfpdt.comp.parse.TkStarters.s_imports;
    17 import static org.refal.rfpdt.comp.parse.TkStarters.s_let;
    18 import static org.refal.rfpdt.comp.parse.TkStarters.s_name;
    19 import static org.refal.rfpdt.comp.parse.TkStarters.s_names;
    20 import static org.refal.rfpdt.comp.parse.TkStarters.s_native;
    21 import static org.refal.rfpdt.comp.parse.TkStarters.s_native_block;
    22 import static org.refal.rfpdt.comp.parse.TkStarters.s_native_sentence;
    23 import static org.refal.rfpdt.comp.parse.TkStarters.s_obj_decl;
    24 import static org.refal.rfpdt.comp.parse.TkStarters.s_path;
    25 import static org.refal.rfpdt.comp.parse.TkStarters.s_path_tail;
    26 import static org.refal.rfpdt.comp.parse.TkStarters.s_paths;
    27 import static org.refal.rfpdt.comp.parse.TkStarters.s_pattern;
    28 import static org.refal.rfpdt.comp.parse.TkStarters.s_pattern_alt;
    29 import static org.refal.rfpdt.comp.parse.TkStarters.s_pattern_alts;
    30 import static org.refal.rfpdt.comp.parse.TkStarters.s_private_decl;
    31 import static org.refal.rfpdt.comp.parse.TkStarters.s_rest;
    32 import static org.refal.rfpdt.comp.parse.TkStarters.s_sentence;
    33 import static org.refal.rfpdt.comp.parse.TkStarters.s_source;
    34 import static org.refal.rfpdt.comp.parse.TkStarters.s_static_symbol;
    35 import static org.refal.rfpdt.comp.parse.TkTags.CHAR;
    36 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    37 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    38 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    39 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    40 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    41 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    42 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    43 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    44 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    45 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    46 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    47 import static org.refal.rfpdt.comp.parse.TkTags.LANGU;
    48 import static org.refal.rfpdt.comp.parse.TkTags.LCURL;
    49 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    50 import static org.refal.rfpdt.comp.parse.TkTags.LPAR;
    51 import static org.refal.rfpdt.comp.parse.TkTags.MATCH_DIR;
    52 import static org.refal.rfpdt.comp.parse.TkTags.MODULE;
    53 import static org.refal.rfpdt.comp.parse.TkTags.NATIVE;
    54 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    55 import static org.refal.rfpdt.comp.parse.TkTags.NUMB;
    56 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    57 import static org.refal.rfpdt.comp.parse.TkTags.PUBLIC;
    58 import static org.refal.rfpdt.comp.parse.TkTags.RANGU;
    59 import static org.refal.rfpdt.comp.parse.TkTags.RCURL;
    60 import static org.refal.rfpdt.comp.parse.TkTags.REF;
    61 import static org.refal.rfpdt.comp.parse.TkTags.RPAR;
    62 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    63 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    64 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    65 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    66 import static org.refal.rfpdt.comp.parse.TkTags.VAR;
    67 import static org.refal.rfpdt.comp.parse.TkTags.WITH;
    68 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     1package org.refal.rfpdt.parser;
     2
     3import static org.refal.rfpdt.parser.TkFollowers.f_implem;
     4import static org.refal.rfpdt.parser.TkFollowers.f_interf;
     5import static org.refal.rfpdt.parser.TkStarters.s_alt;
     6import static org.refal.rfpdt.parser.TkStarters.s_const_binding;
     7import static org.refal.rfpdt.parser.TkStarters.s_const_decl;
     8import static org.refal.rfpdt.parser.TkStarters.s_decl;
     9import static org.refal.rfpdt.parser.TkStarters.s_decls;
     10import static org.refal.rfpdt.parser.TkStarters.s_directive;
     11import static org.refal.rfpdt.parser.TkStarters.s_directives;
     12import static org.refal.rfpdt.parser.TkStarters.s_exp;
     13import static org.refal.rfpdt.parser.TkStarters.s_exp_head;
     14import static org.refal.rfpdt.parser.TkStarters.s_func_decl;
     15import static org.refal.rfpdt.parser.TkStarters.s_func_def;
     16import static org.refal.rfpdt.parser.TkStarters.s_imports;
     17import static org.refal.rfpdt.parser.TkStarters.s_let;
     18import static org.refal.rfpdt.parser.TkStarters.s_name;
     19import static org.refal.rfpdt.parser.TkStarters.s_names;
     20import static org.refal.rfpdt.parser.TkStarters.s_native;
     21import static org.refal.rfpdt.parser.TkStarters.s_native_block;
     22import static org.refal.rfpdt.parser.TkStarters.s_native_sentence;
     23import static org.refal.rfpdt.parser.TkStarters.s_obj_decl;
     24import static org.refal.rfpdt.parser.TkStarters.s_path;
     25import static org.refal.rfpdt.parser.TkStarters.s_path_tail;
     26import static org.refal.rfpdt.parser.TkStarters.s_paths;
     27import static org.refal.rfpdt.parser.TkStarters.s_pattern;
     28import static org.refal.rfpdt.parser.TkStarters.s_pattern_alt;
     29import static org.refal.rfpdt.parser.TkStarters.s_pattern_alts;
     30import static org.refal.rfpdt.parser.TkStarters.s_private_decl;
     31import static org.refal.rfpdt.parser.TkStarters.s_rest;
     32import static org.refal.rfpdt.parser.TkStarters.s_sentence;
     33import static org.refal.rfpdt.parser.TkStarters.s_source;
     34import static org.refal.rfpdt.parser.TkStarters.s_static_symbol;
     35import static org.refal.rfpdt.parser.TkTags.CHAR;
     36import static org.refal.rfpdt.parser.TkTags.COL;
     37import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     38import static org.refal.rfpdt.parser.TkTags.COMMA;
     39import static org.refal.rfpdt.parser.TkTags.CONST;
     40import static org.refal.rfpdt.parser.TkTags.CUT;
     41import static org.refal.rfpdt.parser.TkTags.EQL;
     42import static org.refal.rfpdt.parser.TkTags.ERROR;
     43import static org.refal.rfpdt.parser.TkTags.FAIL;
     44import static org.refal.rfpdt.parser.TkTags.FENCE;
     45import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     46import static org.refal.rfpdt.parser.TkTags.ITER;
     47import static org.refal.rfpdt.parser.TkTags.LANGU;
     48import static org.refal.rfpdt.parser.TkTags.LCURL;
     49import static org.refal.rfpdt.parser.TkTags.LET;
     50import static org.refal.rfpdt.parser.TkTags.LPAR;
     51import static org.refal.rfpdt.parser.TkTags.MATCH_DIR;
     52import static org.refal.rfpdt.parser.TkTags.MODULE;
     53import static org.refal.rfpdt.parser.TkTags.NATIVE;
     54import static org.refal.rfpdt.parser.TkTags.NOT;
     55import static org.refal.rfpdt.parser.TkTags.NUMB;
     56import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     57import static org.refal.rfpdt.parser.TkTags.PUBLIC;
     58import static org.refal.rfpdt.parser.TkTags.RANGU;
     59import static org.refal.rfpdt.parser.TkTags.RCURL;
     60import static org.refal.rfpdt.parser.TkTags.REF;
     61import static org.refal.rfpdt.parser.TkTags.RPAR;
     62import static org.refal.rfpdt.parser.TkTags.SC;
     63import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     64import static org.refal.rfpdt.parser.TkTags.TRAP;
     65import static org.refal.rfpdt.parser.TkTags.USE;
     66import static org.refal.rfpdt.parser.TkTags.VAR;
     67import static org.refal.rfpdt.parser.TkTags.WITH;
     68import static org.refal.rfpdt.parser.TkTags.WORD;
    6969
    7070import java.io.IOException;
     
    7272import java.util.ArrayList;
    7373
    74 import org.refal.rfpdt.comp.MsgCode;
    75 import org.refal.rfpdt.comp.MsgHandler;
    76 import org.refal.rfpdt.comp.RfpResource;
    77 import org.refal.rfpdt.comp.SrcPosition;
    78 import org.refal.rfpdt.comp.ast.AstAlt;
    79 import org.refal.rfpdt.comp.ast.AstCall;
    80 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    81 import org.refal.rfpdt.comp.ast.AstConstBinding;
    82 import org.refal.rfpdt.comp.ast.AstCut;
    83 import org.refal.rfpdt.comp.ast.AstCutAll;
    84 import org.refal.rfpdt.comp.ast.AstError;
    85 import org.refal.rfpdt.comp.ast.AstExp;
    86 import org.refal.rfpdt.comp.ast.AstFail;
    87 import org.refal.rfpdt.comp.ast.AstFence;
    88 import org.refal.rfpdt.comp.ast.AstFormat;
    89 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    90 import org.refal.rfpdt.comp.ast.AstFuncDef;
    91 import org.refal.rfpdt.comp.ast.AstImplem;
    92 import org.refal.rfpdt.comp.ast.AstInterf;
    93 import org.refal.rfpdt.comp.ast.AstIter;
    94 import org.refal.rfpdt.comp.ast.AstName;
    95 import org.refal.rfpdt.comp.ast.AstNative;
    96 import org.refal.rfpdt.comp.ast.AstNot;
    97 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    98 import org.refal.rfpdt.comp.ast.AstObjDecl;
    99 import org.refal.rfpdt.comp.ast.AstParen;
    100 import org.refal.rfpdt.comp.ast.AstPattern;
    101 import org.refal.rfpdt.comp.ast.AstRef;
    102 import org.refal.rfpdt.comp.ast.AstResult;
    103 import org.refal.rfpdt.comp.ast.AstSentence;
    104 import org.refal.rfpdt.comp.ast.AstStatement;
    105 import org.refal.rfpdt.comp.ast.AstSymbol;
    106 import org.refal.rfpdt.comp.ast.AstTerm;
    107 import org.refal.rfpdt.comp.ast.AstTopNode;
    108 import org.refal.rfpdt.comp.ast.AstTraceAll;
    109 import org.refal.rfpdt.comp.ast.AstTrap;
    110 import org.refal.rfpdt.comp.ast.AstUse;
    111 import org.refal.rfpdt.comp.ast.AstVar;
    112 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    113 import org.refal.rfpdt.comp.ast.AstAlt.FailMode;
    114 import org.refal.rfpdt.comp.ast.AstFuncDecl.RetMode;
    115 import org.refal.rfpdt.comp.ast.AstObjDecl.ObjKind;
    116 import org.refal.rfpdt.comp.ast.AstPattern.MatchDir;
    117 import org.refal.rfpdt.comp.ast.AstVar.VarType;
     74import org.refal.rfpdt.ast.AstAlt;
     75import org.refal.rfpdt.ast.AstCall;
     76import org.refal.rfpdt.ast.AstCharSymbol;
     77import org.refal.rfpdt.ast.AstConstBinding;
     78import org.refal.rfpdt.ast.AstCut;
     79import org.refal.rfpdt.ast.AstCutAll;
     80import org.refal.rfpdt.ast.AstError;
     81import org.refal.rfpdt.ast.AstExpr;
     82import org.refal.rfpdt.ast.AstFail;
     83import org.refal.rfpdt.ast.AstFence;
     84import org.refal.rfpdt.ast.AstFormat;
     85import org.refal.rfpdt.ast.AstFuncDecl;
     86import org.refal.rfpdt.ast.AstFuncDef;
     87import org.refal.rfpdt.ast.AstImplem;
     88import org.refal.rfpdt.ast.AstInterf;
     89import org.refal.rfpdt.ast.AstIter;
     90import org.refal.rfpdt.ast.AstName;
     91import org.refal.rfpdt.ast.AstNative;
     92import org.refal.rfpdt.ast.AstNot;
     93import org.refal.rfpdt.ast.AstNumberSymbol;
     94import org.refal.rfpdt.ast.AstObjDecl;
     95import org.refal.rfpdt.ast.AstParen;
     96import org.refal.rfpdt.ast.AstPattern;
     97import org.refal.rfpdt.ast.AstRef;
     98import org.refal.rfpdt.ast.AstResult;
     99import org.refal.rfpdt.ast.AstSentence;
     100import org.refal.rfpdt.ast.AstStatement;
     101import org.refal.rfpdt.ast.AstSymbol;
     102import org.refal.rfpdt.ast.AstTerm;
     103import org.refal.rfpdt.ast.AstTopNode;
     104import org.refal.rfpdt.ast.AstTraceAll;
     105import org.refal.rfpdt.ast.AstTrap;
     106import org.refal.rfpdt.ast.AstUse;
     107import org.refal.rfpdt.ast.AstVar;
     108import org.refal.rfpdt.ast.AstWordSymbol;
     109import org.refal.rfpdt.ast.AstAlt.FailMode;
     110import org.refal.rfpdt.ast.AstFuncDecl.RetMode;
     111import org.refal.rfpdt.ast.AstObjDecl.ObjKind;
     112import org.refal.rfpdt.ast.AstPattern.MatchDir;
     113import org.refal.rfpdt.ast.AstVar.VarType;
     114import org.refal.rfpdt.compiler.MsgCode;
     115import org.refal.rfpdt.compiler.MsgHandler;
     116import org.refal.rfpdt.compiler.RfpResource;
     117import org.refal.rfpdt.compiler.SrcPosition;
    118118
    119119public final class RfpParser {
     
    398398        AstName astName = name(EQL | s_exp | ftk, null);
    399399        accept(EQL, s_exp | ftk);
    400         AstExp astExp = exp(ftk);
     400        AstExpr astExp = exp(ftk);
    401401        list.add(new AstConstBinding(SrcPosition.fromToInclusive(astName.pos, astExp.pos), astName, isPublic, astExp));
    402402    }
     
    412412        nextTk();
    413413        AstName astName = name(s_exp | EQL | ftk, MsgCode.MissingFunctionName);
    414         AstExp inFormat = exp(EQL | s_exp | ftk);
     414        AstExpr inFormat = exp(EQL | s_exp | ftk);
    415415        accept(EQL, s_exp | ftk);
    416         AstExp outFormat = exp(ftk);
     416        AstExpr outFormat = exp(ftk);
    417417        list.add(new AstFuncDecl(SrcPosition.fromToInclusive(start, outFormat.pos), astName, isPublic, retMode,
    418418                inFormat, outFormat));
     
    571571                astSource = source(s_let | s_rest | ftk);
    572572            boolean isEmptyLet = true;
    573             AstExp astTarget = new AstExp(tkPos);
     573            AstExpr astTarget = new AstExpr(tkPos);
    574574            if (acceptWOError(LET, s_rest | ftk)) {
    575575                isEmptyLet = false;
     
    647647            statements.add(new AstTrap(SrcPosition.fromToInclusive(start, astSentence.pos), astPath, astSentence));
    648648        } else {
    649             statements.add(new AstResult(tkPos, new AstExp(tkPos)));
     649            statements.add(new AstResult(tkPos, new AstExpr(tkPos)));
    650650            return true;
    651651        }
     
    674674        SrcPosition prev = prevTkPos;
    675675        source(ftk, statements);
    676         statements.add(new AstFormat(SrcPosition.emptyRange(tkPos), new AstExp(SrcPosition.emptyRange(tkPos))));
     676        statements.add(new AstFormat(SrcPosition.emptyRange(tkPos), new AstExpr(SrcPosition.emptyRange(tkPos))));
    677677        return new AstSentence(prev, tkPos, statements.toArray(new AstStatement[statements.size()]));
    678678    }
     
    683683            statements.add(alt(s_pattern_alts | ftk));
    684684        else {
    685             AstExp astExp = exp(s_pattern_alts | ftk);
     685            AstExpr astExp = exp(s_pattern_alts | ftk);
    686686            statements.add(new AstResult(astExp.pos, astExp));
    687687        }
     
    722722            nextTk();
    723723        }
    724         AstExp astExp = exp(ftk);
     724        AstExpr astExp = exp(ftk);
    725725        SrcPosition pos = start == null ? astExp.pos : SrcPosition.fromToInclusive(start, astExp.pos);
    726726        statements.add(new AstPattern(pos, matchDir, astExp));
     
    812812    // /* empty */
    813813
    814     private AstExp exp (long ftk) {
     814    private AstExpr exp (long ftk) {
    815815        ArrayList<AstTerm> termList = new ArrayList<AstTerm>();
    816816        SrcPosition prev = prevTkPos;
    817817        while (sync(s_exp_head, ftk))
    818818            termList.add(exp_head(s_exp_head | ftk));
    819         return new AstExp(prev, tkPos, termList.toArray(new AstTerm[termList.size()]));
     819        return new AstExpr(prev, tkPos, termList.toArray(new AstTerm[termList.size()]));
    820820    }
    821821
     
    844844        else if (tkIs(LPAR)) {
    845845            nextTk();
    846             AstExp astExp = exp(RPAR | ftk);
     846            AstExpr astExp = exp(RPAR | ftk);
    847847            SrcPosition pos;
    848848            if (accept(RPAR, ftk))
     
    861861            nextTk();
    862862            AstName astName = name(s_exp | RANGU | ftk, MsgCode.MissingFunctionName);
    863             AstExp astExp = exp(RANGU | ftk);
     863            AstExpr astExp = exp(RANGU | ftk);
    864864            SrcPosition pos;
    865865            if (accept(RANGU, ftk))
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/RfpScanner.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
    2 
    3 import static org.refal.rfpdt.comp.parse.TkTags.CHAR;
    4 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    5 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    6 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    7 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    8 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    9 import static org.refal.rfpdt.comp.parse.TkTags.EOP;
    10 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    11 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    12 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    13 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    14 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    15 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    16 import static org.refal.rfpdt.comp.parse.TkTags.LANGU;
    17 import static org.refal.rfpdt.comp.parse.TkTags.LCURL;
    18 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    19 import static org.refal.rfpdt.comp.parse.TkTags.LPAR;
    20 import static org.refal.rfpdt.comp.parse.TkTags.MATCH_DIR;
    21 import static org.refal.rfpdt.comp.parse.TkTags.MODULE;
    22 import static org.refal.rfpdt.comp.parse.TkTags.NATIVE;
    23 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    24 import static org.refal.rfpdt.comp.parse.TkTags.NUMB;
    25 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    26 import static org.refal.rfpdt.comp.parse.TkTags.PUBLIC;
    27 import static org.refal.rfpdt.comp.parse.TkTags.RANGU;
    28 import static org.refal.rfpdt.comp.parse.TkTags.RCURL;
    29 import static org.refal.rfpdt.comp.parse.TkTags.REF;
    30 import static org.refal.rfpdt.comp.parse.TkTags.RPAR;
    31 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    32 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    33 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    34 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    35 import static org.refal.rfpdt.comp.parse.TkTags.VAR;
    36 import static org.refal.rfpdt.comp.parse.TkTags.WITH;
    37 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     1package org.refal.rfpdt.parser;
     2
     3import static org.refal.rfpdt.parser.TkTags.CHAR;
     4import static org.refal.rfpdt.parser.TkTags.COL;
     5import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     6import static org.refal.rfpdt.parser.TkTags.COMMA;
     7import static org.refal.rfpdt.parser.TkTags.CONST;
     8import static org.refal.rfpdt.parser.TkTags.CUT;
     9import static org.refal.rfpdt.parser.TkTags.EOP;
     10import static org.refal.rfpdt.parser.TkTags.EQL;
     11import static org.refal.rfpdt.parser.TkTags.ERROR;
     12import static org.refal.rfpdt.parser.TkTags.FAIL;
     13import static org.refal.rfpdt.parser.TkTags.FENCE;
     14import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     15import static org.refal.rfpdt.parser.TkTags.ITER;
     16import static org.refal.rfpdt.parser.TkTags.LANGU;
     17import static org.refal.rfpdt.parser.TkTags.LCURL;
     18import static org.refal.rfpdt.parser.TkTags.LET;
     19import static org.refal.rfpdt.parser.TkTags.LPAR;
     20import static org.refal.rfpdt.parser.TkTags.MATCH_DIR;
     21import static org.refal.rfpdt.parser.TkTags.MODULE;
     22import static org.refal.rfpdt.parser.TkTags.NATIVE;
     23import static org.refal.rfpdt.parser.TkTags.NOT;
     24import static org.refal.rfpdt.parser.TkTags.NUMB;
     25import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     26import static org.refal.rfpdt.parser.TkTags.PUBLIC;
     27import static org.refal.rfpdt.parser.TkTags.RANGU;
     28import static org.refal.rfpdt.parser.TkTags.RCURL;
     29import static org.refal.rfpdt.parser.TkTags.REF;
     30import static org.refal.rfpdt.parser.TkTags.RPAR;
     31import static org.refal.rfpdt.parser.TkTags.SC;
     32import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     33import static org.refal.rfpdt.parser.TkTags.TRAP;
     34import static org.refal.rfpdt.parser.TkTags.USE;
     35import static org.refal.rfpdt.parser.TkTags.VAR;
     36import static org.refal.rfpdt.parser.TkTags.WITH;
     37import static org.refal.rfpdt.parser.TkTags.WORD;
    3838
    3939import java.io.EOFException;
     
    4444import java.util.TreeMap;
    4545
    46 import org.refal.rfpdt.comp.MsgCode;
    47 import org.refal.rfpdt.comp.MsgHandler;
    48 import org.refal.rfpdt.comp.RfpResource;
    49 import org.refal.rfpdt.comp.SrcPosition;
    50 import org.refal.rfpdt.comp.ast.AstAlt.FailMode;
    51 import org.refal.rfpdt.comp.ast.AstFuncDecl.RetMode;
    52 import org.refal.rfpdt.comp.ast.AstObjDecl.ObjKind;
    53 import org.refal.rfpdt.comp.ast.AstPattern.MatchDir;
     46import org.refal.rfpdt.ast.AstAlt.FailMode;
     47import org.refal.rfpdt.ast.AstFuncDecl.RetMode;
     48import org.refal.rfpdt.ast.AstObjDecl.ObjKind;
     49import org.refal.rfpdt.ast.AstPattern.MatchDir;
     50import org.refal.rfpdt.compiler.MsgCode;
     51import org.refal.rfpdt.compiler.MsgHandler;
     52import org.refal.rfpdt.compiler.RfpResource;
     53import org.refal.rfpdt.compiler.SrcPosition;
    5454
    5555public final class RfpScanner {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/TkFollowers.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
     1package org.refal.rfpdt.parser;
    22
    3 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    4 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    5 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    6 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    7 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    8 import static org.refal.rfpdt.comp.parse.TkTags.EOP;
    9 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    10 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    11 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    12 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    13 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    14 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    15 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    16 import static org.refal.rfpdt.comp.parse.TkTags.NATIVE;
    17 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    18 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    19 import static org.refal.rfpdt.comp.parse.TkTags.PUBLIC;
    20 import static org.refal.rfpdt.comp.parse.TkTags.RANGU;
    21 import static org.refal.rfpdt.comp.parse.TkTags.RCURL;
    22 import static org.refal.rfpdt.comp.parse.TkTags.RPAR;
    23 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    24 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    25 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    26 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    27 import static org.refal.rfpdt.comp.parse.TkTags.WITH;
    28 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     3import static org.refal.rfpdt.parser.TkTags.COL;
     4import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     5import static org.refal.rfpdt.parser.TkTags.COMMA;
     6import static org.refal.rfpdt.parser.TkTags.CONST;
     7import static org.refal.rfpdt.parser.TkTags.CUT;
     8import static org.refal.rfpdt.parser.TkTags.EOP;
     9import static org.refal.rfpdt.parser.TkTags.EQL;
     10import static org.refal.rfpdt.parser.TkTags.ERROR;
     11import static org.refal.rfpdt.parser.TkTags.FAIL;
     12import static org.refal.rfpdt.parser.TkTags.FENCE;
     13import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     14import static org.refal.rfpdt.parser.TkTags.ITER;
     15import static org.refal.rfpdt.parser.TkTags.LET;
     16import static org.refal.rfpdt.parser.TkTags.NATIVE;
     17import static org.refal.rfpdt.parser.TkTags.NOT;
     18import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     19import static org.refal.rfpdt.parser.TkTags.PUBLIC;
     20import static org.refal.rfpdt.parser.TkTags.RANGU;
     21import static org.refal.rfpdt.parser.TkTags.RCURL;
     22import static org.refal.rfpdt.parser.TkTags.RPAR;
     23import static org.refal.rfpdt.parser.TkTags.SC;
     24import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     25import static org.refal.rfpdt.parser.TkTags.TRAP;
     26import static org.refal.rfpdt.parser.TkTags.USE;
     27import static org.refal.rfpdt.parser.TkTags.WITH;
     28import static org.refal.rfpdt.parser.TkTags.WORD;
    2929
    3030/**
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/TkImages.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
     1package org.refal.rfpdt.parser;
    22
    3 import static org.refal.rfpdt.comp.parse.TkTags.CHAR;
    4 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    5 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    6 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    7 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    8 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    9 import static org.refal.rfpdt.comp.parse.TkTags.EOP;
    10 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    11 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    12 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    13 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    14 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    15 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    16 import static org.refal.rfpdt.comp.parse.TkTags.LANGU;
    17 import static org.refal.rfpdt.comp.parse.TkTags.LCURL;
    18 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    19 import static org.refal.rfpdt.comp.parse.TkTags.LPAR;
    20 import static org.refal.rfpdt.comp.parse.TkTags.MATCH_DIR;
    21 import static org.refal.rfpdt.comp.parse.TkTags.MODULE;
    22 import static org.refal.rfpdt.comp.parse.TkTags.NATIVE;
    23 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    24 import static org.refal.rfpdt.comp.parse.TkTags.NUMB;
    25 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    26 import static org.refal.rfpdt.comp.parse.TkTags.PUBLIC;
    27 import static org.refal.rfpdt.comp.parse.TkTags.RANGU;
    28 import static org.refal.rfpdt.comp.parse.TkTags.RCURL;
    29 import static org.refal.rfpdt.comp.parse.TkTags.REF;
    30 import static org.refal.rfpdt.comp.parse.TkTags.RPAR;
    31 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    32 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    33 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    34 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    35 import static org.refal.rfpdt.comp.parse.TkTags.VAR;
    36 import static org.refal.rfpdt.comp.parse.TkTags.WITH;
    37 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     3import static org.refal.rfpdt.parser.TkTags.CHAR;
     4import static org.refal.rfpdt.parser.TkTags.COL;
     5import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     6import static org.refal.rfpdt.parser.TkTags.COMMA;
     7import static org.refal.rfpdt.parser.TkTags.CONST;
     8import static org.refal.rfpdt.parser.TkTags.CUT;
     9import static org.refal.rfpdt.parser.TkTags.EOP;
     10import static org.refal.rfpdt.parser.TkTags.EQL;
     11import static org.refal.rfpdt.parser.TkTags.ERROR;
     12import static org.refal.rfpdt.parser.TkTags.FAIL;
     13import static org.refal.rfpdt.parser.TkTags.FENCE;
     14import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     15import static org.refal.rfpdt.parser.TkTags.ITER;
     16import static org.refal.rfpdt.parser.TkTags.LANGU;
     17import static org.refal.rfpdt.parser.TkTags.LCURL;
     18import static org.refal.rfpdt.parser.TkTags.LET;
     19import static org.refal.rfpdt.parser.TkTags.LPAR;
     20import static org.refal.rfpdt.parser.TkTags.MATCH_DIR;
     21import static org.refal.rfpdt.parser.TkTags.MODULE;
     22import static org.refal.rfpdt.parser.TkTags.NATIVE;
     23import static org.refal.rfpdt.parser.TkTags.NOT;
     24import static org.refal.rfpdt.parser.TkTags.NUMB;
     25import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     26import static org.refal.rfpdt.parser.TkTags.PUBLIC;
     27import static org.refal.rfpdt.parser.TkTags.RANGU;
     28import static org.refal.rfpdt.parser.TkTags.RCURL;
     29import static org.refal.rfpdt.parser.TkTags.REF;
     30import static org.refal.rfpdt.parser.TkTags.RPAR;
     31import static org.refal.rfpdt.parser.TkTags.SC;
     32import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     33import static org.refal.rfpdt.parser.TkTags.TRAP;
     34import static org.refal.rfpdt.parser.TkTags.USE;
     35import static org.refal.rfpdt.parser.TkTags.VAR;
     36import static org.refal.rfpdt.parser.TkTags.WITH;
     37import static org.refal.rfpdt.parser.TkTags.WORD;
    3838
    3939import java.util.HashMap;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/TkStarters.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
     1package org.refal.rfpdt.parser;
    22
    3 import static org.refal.rfpdt.comp.parse.TkTags.CHAR;
    4 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    5 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    6 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    7 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    8 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    9 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    10 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    11 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    12 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    13 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    14 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    15 import static org.refal.rfpdt.comp.parse.TkTags.LANGU;
    16 import static org.refal.rfpdt.comp.parse.TkTags.LCURL;
    17 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    18 import static org.refal.rfpdt.comp.parse.TkTags.LPAR;
    19 import static org.refal.rfpdt.comp.parse.TkTags.MATCH_DIR;
    20 import static org.refal.rfpdt.comp.parse.TkTags.MODULE;
    21 import static org.refal.rfpdt.comp.parse.TkTags.NATIVE;
    22 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    23 import static org.refal.rfpdt.comp.parse.TkTags.NUMB;
    24 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    25 import static org.refal.rfpdt.comp.parse.TkTags.PUBLIC;
    26 import static org.refal.rfpdt.comp.parse.TkTags.REF;
    27 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    28 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    29 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    30 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    31 import static org.refal.rfpdt.comp.parse.TkTags.VAR;
    32 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     3import static org.refal.rfpdt.parser.TkTags.CHAR;
     4import static org.refal.rfpdt.parser.TkTags.COL;
     5import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     6import static org.refal.rfpdt.parser.TkTags.COMMA;
     7import static org.refal.rfpdt.parser.TkTags.CONST;
     8import static org.refal.rfpdt.parser.TkTags.CUT;
     9import static org.refal.rfpdt.parser.TkTags.EQL;
     10import static org.refal.rfpdt.parser.TkTags.ERROR;
     11import static org.refal.rfpdt.parser.TkTags.FAIL;
     12import static org.refal.rfpdt.parser.TkTags.FENCE;
     13import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     14import static org.refal.rfpdt.parser.TkTags.ITER;
     15import static org.refal.rfpdt.parser.TkTags.LANGU;
     16import static org.refal.rfpdt.parser.TkTags.LCURL;
     17import static org.refal.rfpdt.parser.TkTags.LET;
     18import static org.refal.rfpdt.parser.TkTags.LPAR;
     19import static org.refal.rfpdt.parser.TkTags.MATCH_DIR;
     20import static org.refal.rfpdt.parser.TkTags.MODULE;
     21import static org.refal.rfpdt.parser.TkTags.NATIVE;
     22import static org.refal.rfpdt.parser.TkTags.NOT;
     23import static org.refal.rfpdt.parser.TkTags.NUMB;
     24import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     25import static org.refal.rfpdt.parser.TkTags.PUBLIC;
     26import static org.refal.rfpdt.parser.TkTags.REF;
     27import static org.refal.rfpdt.parser.TkTags.SC;
     28import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     29import static org.refal.rfpdt.parser.TkTags.TRAP;
     30import static org.refal.rfpdt.parser.TkTags.USE;
     31import static org.refal.rfpdt.parser.TkTags.VAR;
     32import static org.refal.rfpdt.parser.TkTags.WORD;
    3333
    3434/**
  • devel-tools/trunk/eclipse/org.refal.rfpdt.core/src/org/refal/rfpdt/parser/TkTags.java

    r3508 r3566  
    1 package org.refal.rfpdt.comp.parse;
     1package org.refal.rfpdt.parser;
    22
    33/**
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/FenceAndCutCheckerTest.java

    r3508 r3566  
    44
    55import org.junit.Test;
    6 import org.refal.rfpdt.comp.FenceAndCutChecker;
    7 import org.refal.rfpdt.comp.MsgCode;
    8 import org.refal.rfpdt.comp.ast.AstImplem;
     6import org.refal.rfpdt.ast.AstImplem;
     7import org.refal.rfpdt.compiler.FenceAndCutChecker;
     8import org.refal.rfpdt.compiler.MsgCode;
    99
    1010public class FenceAndCutCheckerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/FormatCheckerTest.java

    r3508 r3566  
    88import org.junit.Before;
    99import org.junit.Test;
    10 import org.refal.rfpdt.comp.ExpChecker;
    11 import org.refal.rfpdt.comp.FormatChecker;
    12 import org.refal.rfpdt.comp.MsgCode;
    13 import org.refal.rfpdt.comp.NameChecker;
    14 import org.refal.rfpdt.comp.ast.AstImplem;
     10import org.refal.rfpdt.ast.AstImplem;
     11import org.refal.rfpdt.compiler.ExpChecker;
     12import org.refal.rfpdt.compiler.FormatChecker;
     13import org.refal.rfpdt.compiler.MsgCode;
     14import org.refal.rfpdt.compiler.NameChecker;
    1515
    1616public class FormatCheckerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/ImportCheckerTest.java

    r3508 r3566  
    1010import org.junit.Before;
    1111import org.junit.Test;
    12 import org.refal.rfpdt.comp.AstEnvironment;
    13 import org.refal.rfpdt.comp.ImportChecker;
    14 import org.refal.rfpdt.comp.MsgCode;
    15 import org.refal.rfpdt.comp.NameChecker;
    16 import org.refal.rfpdt.comp.ast.AstImplem;
    17 import org.refal.rfpdt.comp.parse.RfpParser;
     12import org.refal.rfpdt.ast.AstImplem;
     13import org.refal.rfpdt.compiler.AstEnvironment;
     14import org.refal.rfpdt.compiler.ImportChecker;
     15import org.refal.rfpdt.compiler.MsgCode;
     16import org.refal.rfpdt.compiler.NameChecker;
     17import org.refal.rfpdt.parser.RfpParser;
    1818
    1919public class ImportCheckerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/InMemoryCompilerEnvironment.java

    r3508 r3566  
    1111import java.util.Set;
    1212
    13 import org.refal.rfpdt.comp.CompilerEnvironment;
    14 import org.refal.rfpdt.comp.MsgHandler;
     13import org.refal.rfpdt.compiler.CompilerEnvironment;
     14import org.refal.rfpdt.compiler.MsgHandler;
    1515
    1616final class InMemoryCompilerEnvironment implements CompilerEnvironment {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/MsgAccumulator.java

    r3508 r3566  
    33import java.util.ArrayList;
    44
    5 import org.refal.rfpdt.comp.MsgCode;
    6 import org.refal.rfpdt.comp.MsgHandler;
    7 import org.refal.rfpdt.comp.SrcPosition;
     5import org.refal.rfpdt.compiler.MsgCode;
     6import org.refal.rfpdt.compiler.MsgHandler;
     7import org.refal.rfpdt.compiler.SrcPosition;
    88
    99public class MsgAccumulator extends MsgHandler {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/NameCheckerTest.java

    r3508 r3566  
    66import org.junit.Before;
    77import org.junit.Test;
    8 import org.refal.rfpdt.comp.MsgCode;
    9 import org.refal.rfpdt.comp.NameChecker;
    10 import org.refal.rfpdt.comp.ast.AstImplem;
     8import org.refal.rfpdt.ast.AstImplem;
     9import org.refal.rfpdt.compiler.MsgCode;
     10import org.refal.rfpdt.compiler.NameChecker;
    1111
    1212public class NameCheckerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/ParserTest.java

    r3508 r3566  
    77import org.junit.Before;
    88import org.junit.Test;
    9 import org.refal.rfpdt.comp.MsgCode;
    10 import org.refal.rfpdt.comp.ast.AstImplem;
    11 import org.refal.rfpdt.comp.ast.AstInterf;
    12 import org.refal.rfpdt.comp.ast.ImageBuilder;
     9import org.refal.rfpdt.ast.AstImplem;
     10import org.refal.rfpdt.ast.AstInterf;
     11import org.refal.rfpdt.ast.ImageBuilder;
     12import org.refal.rfpdt.compiler.MsgCode;
    1313
    1414public class ParserTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/ScannerErrorTest.java

    r3508 r3566  
    88import org.junit.Before;
    99import org.junit.Test;
    10 import org.refal.rfpdt.comp.MsgCode;
     10import org.refal.rfpdt.compiler.MsgCode;
    1111
    1212public final class ScannerErrorTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/ScannerTest.java

    r3508 r3566  
    44import static org.junit.Assert.assertEquals;
    55import static org.junit.Assert.assertTrue;
    6 import static org.refal.rfpdt.comp.parse.TkTags.COL;
    7 import static org.refal.rfpdt.comp.parse.TkTags.COL_CURL;
    8 import static org.refal.rfpdt.comp.parse.TkTags.COMMA;
    9 import static org.refal.rfpdt.comp.parse.TkTags.CONST;
    10 import static org.refal.rfpdt.comp.parse.TkTags.CUT;
    11 import static org.refal.rfpdt.comp.parse.TkTags.EQL;
    12 import static org.refal.rfpdt.comp.parse.TkTags.ERROR;
    13 import static org.refal.rfpdt.comp.parse.TkTags.FAIL;
    14 import static org.refal.rfpdt.comp.parse.TkTags.FENCE;
    15 import static org.refal.rfpdt.comp.parse.TkTags.FUNC_DECL;
    16 import static org.refal.rfpdt.comp.parse.TkTags.ITER;
    17 import static org.refal.rfpdt.comp.parse.TkTags.LANGU;
    18 import static org.refal.rfpdt.comp.parse.TkTags.LCURL;
    19 import static org.refal.rfpdt.comp.parse.TkTags.LET;
    20 import static org.refal.rfpdt.comp.parse.TkTags.LPAR;
    21 import static org.refal.rfpdt.comp.parse.TkTags.MATCH_DIR;
    22 import static org.refal.rfpdt.comp.parse.TkTags.NOT;
    23 import static org.refal.rfpdt.comp.parse.TkTags.OBJ_DECL;
    24 import static org.refal.rfpdt.comp.parse.TkTags.RANGU;
    25 import static org.refal.rfpdt.comp.parse.TkTags.RCURL;
    26 import static org.refal.rfpdt.comp.parse.TkTags.REF;
    27 import static org.refal.rfpdt.comp.parse.TkTags.RPAR;
    28 import static org.refal.rfpdt.comp.parse.TkTags.SC;
    29 import static org.refal.rfpdt.comp.parse.TkTags.TRACE_ALL;
    30 import static org.refal.rfpdt.comp.parse.TkTags.TRAP;
    31 import static org.refal.rfpdt.comp.parse.TkTags.USE;
    32 import static org.refal.rfpdt.comp.parse.TkTags.WITH;
     6import static org.refal.rfpdt.parser.TkTags.COL;
     7import static org.refal.rfpdt.parser.TkTags.COL_CURL;
     8import static org.refal.rfpdt.parser.TkTags.COMMA;
     9import static org.refal.rfpdt.parser.TkTags.CONST;
     10import static org.refal.rfpdt.parser.TkTags.CUT;
     11import static org.refal.rfpdt.parser.TkTags.EQL;
     12import static org.refal.rfpdt.parser.TkTags.ERROR;
     13import static org.refal.rfpdt.parser.TkTags.FAIL;
     14import static org.refal.rfpdt.parser.TkTags.FENCE;
     15import static org.refal.rfpdt.parser.TkTags.FUNC_DECL;
     16import static org.refal.rfpdt.parser.TkTags.ITER;
     17import static org.refal.rfpdt.parser.TkTags.LANGU;
     18import static org.refal.rfpdt.parser.TkTags.LCURL;
     19import static org.refal.rfpdt.parser.TkTags.LET;
     20import static org.refal.rfpdt.parser.TkTags.LPAR;
     21import static org.refal.rfpdt.parser.TkTags.MATCH_DIR;
     22import static org.refal.rfpdt.parser.TkTags.NOT;
     23import static org.refal.rfpdt.parser.TkTags.OBJ_DECL;
     24import static org.refal.rfpdt.parser.TkTags.RANGU;
     25import static org.refal.rfpdt.parser.TkTags.RCURL;
     26import static org.refal.rfpdt.parser.TkTags.REF;
     27import static org.refal.rfpdt.parser.TkTags.RPAR;
     28import static org.refal.rfpdt.parser.TkTags.SC;
     29import static org.refal.rfpdt.parser.TkTags.TRACE_ALL;
     30import static org.refal.rfpdt.parser.TkTags.TRAP;
     31import static org.refal.rfpdt.parser.TkTags.USE;
     32import static org.refal.rfpdt.parser.TkTags.WITH;
    3333import static org.refal.rfpdt.test.comp.Token.kw;
    3434import static org.refal.rfpdt.test.comp.Token.tChar;
     
    4242import org.junit.Before;
    4343import org.junit.Test;
    44 import org.refal.rfpdt.comp.ast.AstAlt.FailMode;
    45 import org.refal.rfpdt.comp.ast.AstFuncDecl.RetMode;
    46 import org.refal.rfpdt.comp.ast.AstObjDecl.ObjKind;
    47 import org.refal.rfpdt.comp.ast.AstPattern.MatchDir;
     44import org.refal.rfpdt.ast.AstAlt.FailMode;
     45import org.refal.rfpdt.ast.AstFuncDecl.RetMode;
     46import org.refal.rfpdt.ast.AstObjDecl.ObjKind;
     47import org.refal.rfpdt.ast.AstPattern.MatchDir;
    4848
    4949public class ScannerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/Token.java

    r3508 r3566  
    11package org.refal.rfpdt.test.comp;
    22
    3 import static org.refal.rfpdt.comp.parse.TkTags.CHAR;
    4 import static org.refal.rfpdt.comp.parse.TkTags.NUMB;
    5 import static org.refal.rfpdt.comp.parse.TkTags.VAR;
    6 import static org.refal.rfpdt.comp.parse.TkTags.WORD;
     3import static org.refal.rfpdt.parser.TkTags.CHAR;
     4import static org.refal.rfpdt.parser.TkTags.NUMB;
     5import static org.refal.rfpdt.parser.TkTags.VAR;
     6import static org.refal.rfpdt.parser.TkTags.WORD;
    77
    88import java.math.BigInteger;
    99
    10 import org.refal.rfpdt.comp.SrcPosition;
    11 import org.refal.rfpdt.comp.ast.AstAlt.FailMode;
    12 import org.refal.rfpdt.comp.ast.AstFuncDecl.RetMode;
    13 import org.refal.rfpdt.comp.ast.AstObjDecl.ObjKind;
    14 import org.refal.rfpdt.comp.ast.AstPattern.MatchDir;
    15 import org.refal.rfpdt.comp.parse.TkImages;
     10import org.refal.rfpdt.ast.AstAlt.FailMode;
     11import org.refal.rfpdt.ast.AstFuncDecl.RetMode;
     12import org.refal.rfpdt.ast.AstObjDecl.ObjKind;
     13import org.refal.rfpdt.ast.AstPattern.MatchDir;
     14import org.refal.rfpdt.compiler.SrcPosition;
     15import org.refal.rfpdt.parser.TkImages;
    1616
    1717public final class Token {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/Util.java

    r3508 r3566  
    33import static org.junit.Assert.assertEquals;
    44import static org.junit.Assert.assertTrue;
    5 import static org.refal.rfpdt.comp.parse.TkTags.EOP;
     5import static org.refal.rfpdt.parser.TkTags.EOP;
    66
    77import java.io.Reader;
    88import java.util.ArrayList;
    99
    10 import org.refal.rfpdt.comp.MsgCode;
    11 import org.refal.rfpdt.comp.MsgHandler;
    12 import org.refal.rfpdt.comp.RfpResource;
    13 import org.refal.rfpdt.comp.ast.AstImplem;
    14 import org.refal.rfpdt.comp.ast.AstInterf;
    15 import org.refal.rfpdt.comp.parse.RfpParser;
    16 import org.refal.rfpdt.comp.parse.RfpScanner;
     10import org.refal.rfpdt.ast.AstImplem;
     11import org.refal.rfpdt.ast.AstInterf;
     12import org.refal.rfpdt.compiler.MsgCode;
     13import org.refal.rfpdt.compiler.MsgHandler;
     14import org.refal.rfpdt.compiler.RfpResource;
     15import org.refal.rfpdt.parser.RfpParser;
     16import org.refal.rfpdt.parser.RfpScanner;
    1717import org.refal.rfpdt.test.comp.MsgAccumulator.Message;
    1818
  • devel-tools/trunk/eclipse/org.refal.rfpdt.test/src/org/refal/rfpdt/test/comp/VariableScopeCheckerTest.java

    r3508 r3566  
    44
    55import org.junit.Test;
    6 import org.refal.rfpdt.comp.MsgCode;
    7 import org.refal.rfpdt.comp.VariableScopeChecker;
    8 import org.refal.rfpdt.comp.ast.AstImplem;
     6import org.refal.rfpdt.ast.AstImplem;
     7import org.refal.rfpdt.compiler.MsgCode;
     8import org.refal.rfpdt.compiler.VariableScopeChecker;
    99
    1010public class VariableScopeCheckerTest {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/PresentationVisitor.java

    r3508 r3566  
    88import org.eclipse.swt.SWT;
    99import org.eclipse.swt.custom.StyleRange;
    10 import org.refal.rfpdt.comp.RfpResource;
    11 import org.refal.rfpdt.comp.SrcPosition;
    12 import org.refal.rfpdt.comp.ast.AstAlt;
    13 import org.refal.rfpdt.comp.ast.AstCall;
    14 import org.refal.rfpdt.comp.ast.AstCharSymbol;
    15 import org.refal.rfpdt.comp.ast.AstConstBinding;
    16 import org.refal.rfpdt.comp.ast.AstCut;
    17 import org.refal.rfpdt.comp.ast.AstCutAll;
    18 import org.refal.rfpdt.comp.ast.AstError;
    19 import org.refal.rfpdt.comp.ast.AstExp;
    20 import org.refal.rfpdt.comp.ast.AstFail;
    21 import org.refal.rfpdt.comp.ast.AstFence;
    22 import org.refal.rfpdt.comp.ast.AstFormat;
    23 import org.refal.rfpdt.comp.ast.AstFuncDecl;
    24 import org.refal.rfpdt.comp.ast.AstFuncDef;
    25 import org.refal.rfpdt.comp.ast.AstImplem;
    26 import org.refal.rfpdt.comp.ast.AstInterf;
    27 import org.refal.rfpdt.comp.ast.AstIter;
    28 import org.refal.rfpdt.comp.ast.AstName;
    29 import org.refal.rfpdt.comp.ast.AstNative;
    30 import org.refal.rfpdt.comp.ast.AstNode;
    31 import org.refal.rfpdt.comp.ast.AstNot;
    32 import org.refal.rfpdt.comp.ast.AstNumberSymbol;
    33 import org.refal.rfpdt.comp.ast.AstObjDecl;
    34 import org.refal.rfpdt.comp.ast.AstParen;
    35 import org.refal.rfpdt.comp.ast.AstPattern;
    36 import org.refal.rfpdt.comp.ast.AstRef;
    37 import org.refal.rfpdt.comp.ast.AstResult;
    38 import org.refal.rfpdt.comp.ast.AstSentence;
    39 import org.refal.rfpdt.comp.ast.AstStatement;
    40 import org.refal.rfpdt.comp.ast.AstTerm;
    41 import org.refal.rfpdt.comp.ast.AstTopNode;
    42 import org.refal.rfpdt.comp.ast.AstTraceAll;
    43 import org.refal.rfpdt.comp.ast.AstTrap;
    44 import org.refal.rfpdt.comp.ast.AstUse;
    45 import org.refal.rfpdt.comp.ast.AstVar;
    46 import org.refal.rfpdt.comp.ast.AstWordSymbol;
    47 import org.refal.rfpdt.comp.ast.ExpVisitor;
    48 import org.refal.rfpdt.comp.ast.ProgramVisitor;
    49 import org.refal.rfpdt.comp.ast.SentenceVisitor;
     10import org.refal.rfpdt.ast.AstAlt;
     11import org.refal.rfpdt.ast.AstCall;
     12import org.refal.rfpdt.ast.AstCharSymbol;
     13import org.refal.rfpdt.ast.AstConstBinding;
     14import org.refal.rfpdt.ast.AstCut;
     15import org.refal.rfpdt.ast.AstCutAll;
     16import org.refal.rfpdt.ast.AstError;
     17import org.refal.rfpdt.ast.AstExpr;
     18import org.refal.rfpdt.ast.AstFail;
     19import org.refal.rfpdt.ast.AstFence;
     20import org.refal.rfpdt.ast.AstFormat;
     21import org.refal.rfpdt.ast.AstFuncDecl;
     22import org.refal.rfpdt.ast.AstFuncDef;
     23import org.refal.rfpdt.ast.AstImplem;
     24import org.refal.rfpdt.ast.AstInterf;
     25import org.refal.rfpdt.ast.AstIter;
     26import org.refal.rfpdt.ast.AstName;
     27import org.refal.rfpdt.ast.AstNative;
     28import org.refal.rfpdt.ast.AstNode;
     29import org.refal.rfpdt.ast.AstNot;
     30import org.refal.rfpdt.ast.AstNumberSymbol;
     31import org.refal.rfpdt.ast.AstObjDecl;
     32import org.refal.rfpdt.ast.AstParen;
     33import org.refal.rfpdt.ast.AstPattern;
     34import org.refal.rfpdt.ast.AstRef;
     35import org.refal.rfpdt.ast.AstResult;
     36import org.refal.rfpdt.ast.AstSentence;
     37import org.refal.rfpdt.ast.AstStatement;
     38import org.refal.rfpdt.ast.AstTerm;
     39import org.refal.rfpdt.ast.AstTopNode;
     40import org.refal.rfpdt.ast.AstTraceAll;
     41import org.refal.rfpdt.ast.AstTrap;
     42import org.refal.rfpdt.ast.AstUse;
     43import org.refal.rfpdt.ast.AstVar;
     44import org.refal.rfpdt.ast.AstWordSymbol;
     45import org.refal.rfpdt.ast.ExpVisitor;
     46import org.refal.rfpdt.ast.ProgramVisitor;
     47import org.refal.rfpdt.ast.SentenceVisitor;
     48import org.refal.rfpdt.compiler.RfpResource;
     49import org.refal.rfpdt.compiler.SrcPosition;
    5050import org.refal.rfpdt.editor.color.ColorScanner;
    5151import org.refal.rfpdt.editor.color.IColorPreferences;
     
    227227    public void visit (AstCharSymbol astCharSymbol) {}
    228228
    229     public void visit (AstExp astExp) {
     229    public void visit (AstExpr astExp) {
    230230        for (AstTerm term : astExp.termList)
    231231            term.accept(this);
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpEditor.java

    r3520 r3566  
    3636import org.eclipse.ui.texteditor.ChainedPreferenceStore;
    3737import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
    38 import org.refal.rfpdt.comp.ast.AstCall;
    39 import org.refal.rfpdt.comp.ast.AstCut;
    40 import org.refal.rfpdt.comp.ast.AstDecl;
    41 import org.refal.rfpdt.comp.ast.AstFence;
    42 import org.refal.rfpdt.comp.ast.AstFuncDef;
    43 import org.refal.rfpdt.comp.ast.AstImplem;
    44 import org.refal.rfpdt.comp.ast.AstName;
    45 import org.refal.rfpdt.comp.ast.AstNative;
    46 import org.refal.rfpdt.comp.ast.AstNode;
    47 import org.refal.rfpdt.comp.ast.AstRef;
    48 import org.refal.rfpdt.comp.ast.AstVar;
    49 import org.refal.rfpdt.comp.ast.Searcher;
     38import org.refal.rfpdt.ast.AstCall;
     39import org.refal.rfpdt.ast.AstCut;
     40import org.refal.rfpdt.ast.AstDecl;
     41import org.refal.rfpdt.ast.AstFence;
     42import org.refal.rfpdt.ast.AstFuncDef;
     43import org.refal.rfpdt.ast.AstImplem;
     44import org.refal.rfpdt.ast.AstName;
     45import org.refal.rfpdt.ast.AstNative;
     46import org.refal.rfpdt.ast.AstNode;
     47import org.refal.rfpdt.ast.AstRef;
     48import org.refal.rfpdt.ast.AstVar;
     49import org.refal.rfpdt.ast.Searcher;
    5050import org.refal.rfpdt.editor.PresentationVisitor.StylePosition;
    5151import org.refal.rfpdt.editor.color.ColorManager;
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpReconcilingStrategy.java

    r3508 r3566  
    88import org.eclipse.jface.text.reconciler.DirtyRegion;
    99import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
    10 import org.refal.rfpdt.comp.ast.AstImplem;
     10import org.refal.rfpdt.ast.AstImplem;
    1111import org.refal.rfpdt.core.RfpBuilder;
    1212
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpTextHover.java

    r3508 r3566  
    99import org.eclipse.jface.text.source.ISourceViewer;
    1010import org.eclipse.ui.texteditor.MarkerAnnotation;
    11 import org.refal.rfpdt.comp.ast.AstImplem;
    12 import org.refal.rfpdt.comp.ast.AstName;
    13 import org.refal.rfpdt.comp.ast.AstNode;
    14 import org.refal.rfpdt.comp.ast.IHoverInfo;
    15 import org.refal.rfpdt.comp.ast.Searcher;
     11import org.refal.rfpdt.ast.AstImplem;
     12import org.refal.rfpdt.ast.AstName;
     13import org.refal.rfpdt.ast.AstNode;
     14import org.refal.rfpdt.ast.IHoverInfo;
     15import org.refal.rfpdt.ast.Searcher;
    1616
    1717public class RfpTextHover extends DefaultTextHover {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/color/IdentifierDetector.java

    r3508 r3566  
    22
    33import org.eclipse.jface.text.rules.IWordDetector;
    4 import org.refal.rfpdt.comp.parse.RfpCharacter;
     4import org.refal.rfpdt.parser.RfpCharacter;
    55
    66class IdentifierDetector implements IWordDetector {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/color/KeywordDetector.java

    r3508 r3566  
    22
    33import org.eclipse.jface.text.rules.IWordDetector;
    4 import org.refal.rfpdt.comp.parse.RfpCharacter;
     4import org.refal.rfpdt.parser.RfpCharacter;
    55
    66class KeywordDetector implements IWordDetector {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/color/NumberDetector.java

    r3508 r3566  
    22
    33import org.eclipse.jface.text.rules.IWordDetector;
    4 import org.refal.rfpdt.comp.parse.RfpCharacter;
     4import org.refal.rfpdt.parser.RfpCharacter;
    55
    66class NumberDetector implements IWordDetector {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/color/VariableDetector.java

    r3508 r3566  
    22
    33import org.eclipse.jface.text.rules.IWordDetector;
    4 import org.refal.rfpdt.comp.parse.RfpCharacter;
     4import org.refal.rfpdt.parser.RfpCharacter;
    55
    66class VariableDetector implements IWordDetector {
  • devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/color/WhitespaceDetector.java

    r3508 r3566  
    22
    33import org.eclipse.jface.text.rules.IWhitespaceDetector;
    4 import org.refal.rfpdt.comp.parse.RfpCharacter;
     4import org.refal.rfpdt.parser.RfpCharacter;
    55
    66class WhitespaceDetector implements IWhitespaceDetector {
Note: See TracChangeset for help on using the changeset viewer.