diff options
author | michelou <michelou@epfl.ch> | 2006-06-19 10:58:31 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-06-19 10:58:31 +0000 |
commit | e0f22af441441d6ab5ea86a7cab7e2aff491ac66 (patch) | |
tree | 07f66fcb60f0108765bf71f3835bf8902b6336ff /src/compiler | |
parent | 35adc1c48a50f0bd707d02f24db5658903e76610 (diff) | |
download | scala-e0f22af441441d6ab5ea86a7cab7e2aff491ac66.tar.gz scala-e0f22af441441d6ab5ea86a7cab7e2aff491ac66.tar.bz2 scala-e0f22af441441d6ab5ea86a7cab7e2aff491ac66.zip |
removed leading/trailing tabs/blanks in file Al...
removed leading/trailing tabs/blanks in file AlgebraicMatchers.scala
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala | 291 |
1 files changed, 144 insertions, 147 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala index e26d0c6c51..1f54f60790 100644 --- a/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala +++ b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala @@ -1,171 +1,168 @@ -/* NSC -- new scala compiler - * Copyright 2005 LAMP/EPFL +/* NSC -- new Scala compiler + * Copyright 2005-2006 LAMP/EPFL * @author buraq */ // $Id$ -package scala.tools.nsc.matching; +package scala.tools.nsc.matching /** the pattern matcher, tweaked to work with regular patterns * @author Burak Emir */ -trait AlgebraicMatchers requires TransMatcher { - - import global._; - - class AlgebraicMatcher extends PatternMatcher { - - import java.util.Vector ; - import java.util.Iterator ; - - var _m: PartialMatcher = _; - - /*override protected var*/ optimize = false; - - /** constructs an algebraic pattern matcher from cases */ - def construct(m: PartialMatcher, cases: List[CaseDef]): Unit = - construct(m, cases, true); - - /** constructs an algebraic pattern matcher from cases */ - def construct(m: PartialMatcher, cases: List[CaseDef], doBinding: Boolean): Unit = { - this._m = m; - super.initialize( _m.selector, _m.owner, doBinding ); - - val it = cases.elements; - while (it.hasNext) { - val cdef = it.next; - /* - if(cdef != null) - Console.println("algebraic matcher: "+cdef.toString()); // DEBUG - else - scala.Predef.error("got CaseDef null in alg matcher!"); - */ - enter(cdef); - } - - //if (unit.global.log()) { - // unit.global.log("internal pattern matching structure"); - // print(); - // } - _m.tree = toTree(); - } - - - /** initializes this AlgebraicMatcher, see Matcher.initialize - void initialize() {} - */ - /* - def isStarApply(tree: Tree.Apply): Boolean = { - val params:Array[Symbol] = tree.fun.getType().valueParams(); - //System.err.println( tree.fun.type.resultType().symbol() ); - (tree.args.length == 1) - && (tree.getType().symbol().flags & Modifiers.CASE) != 0 - && params.length > 0 - && (params(params.length-1).flags & Modifiers.REPEATED) != 0; - } - */ - //////////// generator methods - - override def toTree(): Tree = { - - this.exit = currentOwner.newLabel(root.pos, "exitA") - .setInfo(new MethodType(List(resultType), resultType)); - - val result = exit.newValueParameter(root.pos, "resultA").setInfo( resultType ); - - Block( - List ( - ValDef(root.symbol, _m.selector) - ), - If( super.toTree(root.and), - LabelDef(exit, List(result), Ident(result)), - ThrowMatchError( _m.pos, Ident(root.symbol) )) - ); - } - - protected override def toTree(node: PatternNode, selector: Tree): Tree = { - //System.err.println("AM.toTree called"+node); - if (node == null) - Literal(false); - else node match { - case SeqContainerPat( _, _ ) => - callSequenceMatcher( node, - selector ); - case _ => - super.toTree( node, selector ); - } - } - - /** collects all sequence patterns and returns the default - */ - def collectSeqPats(node1: PatternNode, seqPatNodes: Vector, bodies: Vector): PatternNode = { - var node = node1; - var defaultNode: PatternNode = null; - var exit = false; - do { - if( node == null ) - exit=true; //defaultNode = node; // break +trait AlgebraicMatchers requires TransMatcher { + + import global._ + + class AlgebraicMatcher extends PatternMatcher { + + import java.util.Vector + import java.util.Iterator + + var _m: PartialMatcher = _ + + /*override protected var*/ optimize = false + + /** constructs an algebraic pattern matcher from cases */ + def construct(m: PartialMatcher, cases: List[CaseDef]): Unit = + construct(m, cases, true) + + /** constructs an algebraic pattern matcher from cases */ + def construct(m: PartialMatcher, cases: List[CaseDef], doBinding: Boolean): Unit = { + this._m = m + super.initialize(_m.selector, _m.owner, doBinding) + + val it = cases.elements + while (it.hasNext) { + val cdef = it.next + /* + if(cdef != null) + Console.println("algebraic matcher: "+cdef.toString()); // DEBUG else - node match { - case SeqContainerPat( _, _ ) => - seqPatNodes.add( node ); - bodies.add( super.toTree( node.and ) ); - node = node.or; - exit//defaultNode = node; // break; - - case _ => - defaultNode = node; - } - } while (!exit && (null == defaultNode)) ; - - defaultNode; - } - - def callSequenceMatcher(node: PatternNode, selector1: Tree): Tree = { - - //Console.println("calling sequent matcher for"+node); - /* ???????????????????????? necessary to test whether is a Seq? - gen.If(selector.pos, maybe And( Is(selector, seqpat.type()) )???) - */ + scala.Predef.error("got CaseDef null in alg matcher!"); + */ + enter(cdef) + } + + //if (unit.global.log()) { + // unit.global.log("internal pattern matching structure"); + // print(); + // } + _m.tree = toTree() + } - // translate the _.and subtree of this SeqContainerPat + /** initializes this AlgebraicMatcher, see Matcher.initialize + void initialize() {} + */ + /* + def isStarApply(tree: Tree.Apply): Boolean = { + val params:Array[Symbol] = tree.fun.getType().valueParams(); + //System.err.println( tree.fun.type.resultType().symbol() ); + (tree.args.length == 1) + && (tree.getType().symbol().flags & Modifiers.CASE) != 0 + && params.length > 0 + && (params(params.length-1).flags & Modifiers.REPEATED) != 0; + } + */ + //////////// generator methods - val seqPatNodes = new Vector(); - val bodies = new Vector(); + override def toTree(): Tree = { - var defaultNode = collectSeqPats(node, seqPatNodes, bodies); + this.exit = currentOwner.newLabel(root.pos, "exitA") + .setInfo(new MethodType(List(resultType), resultType)) - val defaultCase = toTree(defaultNode, selector1); + val result = exit.newValueParameter(root.pos, "resultA").setInfo(resultType) - val wordRec = new SequenceMatcher(); + Block( + List( + ValDef(root.symbol, _m.selector) + ), + If( super.toTree(root.and), + LabelDef(exit, List(result), Ident(result)), + ThrowMatchError( _m.pos, Ident(root.symbol) )) + ) + } - val m = new PartialMatcher { - val owner = _m.owner; - val selector = selector1; + protected override def toTree(node: PatternNode, selector: Tree): Tree = { + //System.err.println("AM.toTree called"+node); + if (node == null) + Literal(false) + else node match { + case SeqContainerPat( _, _ ) => + callSequenceMatcher(node, selector) + case _ => + super.toTree(node, selector) + } } - var pats: scala.List[Tree] = Nil; - var body: scala.List[Tree] = Nil; - - val tmp = bodies.toArray(); - var j = 0; - val it = seqPatNodes.iterator(); - while (it.hasNext()) { - //pats(j) = it.next().asInstanceOf[SeqContainerPat].seqpat; - pats = it.next().asInstanceOf[SeqContainerPat].seqpat :: pats; - //body(j) = tmp(j).asInstanceOf[Tree]; - body = tmp(j).asInstanceOf[Tree] :: body; - j = j + 1; + /** collects all sequence patterns and returns the default + */ + def collectSeqPats(node1: PatternNode, seqPatNodes: Vector, bodies: Vector): PatternNode = { + var node = node1 + var defaultNode: PatternNode = null + var exit = false + do { + if (node == null) + exit = true //defaultNode = node; // break + else + node match { + case SeqContainerPat( _, _ ) => + seqPatNodes.add(node) + bodies.add(super.toTree(node.and)) + node = node.or + exit //defaultNode = node; break; + case _ => + defaultNode = node + } + } while (!exit && (null == defaultNode)) + + defaultNode } - //Tree defaultTree = toTree(node.or, selector); // cdef.body ; - wordRec.construct(m, pats.reverse, body.reverse, defaultCase, doBinding); + def callSequenceMatcher(node: PatternNode, selector1: Tree): Tree = { + + //Console.println("calling sequent matcher for"+node); + /* ???????????????????????? necessary to test whether is a Seq? + gen.If(selector.pos, maybe And( Is(selector, seqpat.type()) )???) + */ + + // translate the _.and subtree of this SeqContainerPat + + val seqPatNodes = new Vector() + val bodies = new Vector() + + var defaultNode = collectSeqPats(node, seqPatNodes, bodies) + + val defaultCase = toTree(defaultNode, selector1) - //_m.defs.addAll(m.defs); + val wordRec = new SequenceMatcher() - m.tree; - } + val m = new PartialMatcher { + val owner = _m.owner + val selector = selector1 + } + + var pats: scala.List[Tree] = Nil + var body: scala.List[Tree] = Nil + + val tmp = bodies.toArray() + var j = 0 + val it = seqPatNodes.iterator() + while (it.hasNext()) { + //pats(j) = it.next().asInstanceOf[SeqContainerPat].seqpat; + pats = it.next().asInstanceOf[SeqContainerPat].seqpat :: pats + //body(j) = tmp(j).asInstanceOf[Tree]; + body = tmp(j).asInstanceOf[Tree] :: body + j = j + 1 + } + //Tree defaultTree = toTree(node.or, selector); // cdef.body ; + + wordRec.construct(m, pats.reverse, body.reverse, defaultCase, doBinding) + + //_m.defs.addAll(m.defs); + + m.tree + } -} // class AlgebraicMatcher + } // class AlgebraicMatcher } |