Permalink
Browse files

Refactored package and artifact name to something I control (in other…

… words, I'm giving up my attempt to reason with the university)
  • Loading branch information...
1 parent 5f40abc commit 2c30ffed7951fc2cac8676c6aee76833067dcd3a @djspiewak committed Mar 7, 2012
Showing with 44 additions and 44 deletions.
  1. +2 −2 build.sbt
  2. +1 −1 examples/src/Example.scala
  3. +1 −1 examples/src/arithmetic/ArithmeticParser.scala
  4. +1 −1 examples/src/config/ConfigParser.scala
  5. +1 −1 examples/src/lambdacalc/LambdaCalcParser.scala
  6. +1 −1 examples/src/miniml/MiniMLParser.scala
  7. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/Global.scala
  8. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/LineStream.scala
  9. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/Parsers.scala
  10. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/RegexParsers.scala
  11. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/RegexUtils.scala
  12. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/ast/Filter.scala
  13. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/ast/Filters.scala
  14. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/ast/nodes.scala
  15. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/result.scala
  16. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/gll/tilde.scala
  17. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/util/ComplementarySet.scala
  18. +3 −3 src/main/scala/{edu/uwm/cs → com/codecommit}/util/HOMap.scala
  19. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/util/SetSyntax.scala
  20. +1 −1 src/main/scala/{edu/uwm/cs → com/codecommit}/util/Thunkable.scala
  21. +2 −2 src/main/scala/{edu/uwm/cs → com/codecommit}/util/package.scala
  22. +1 −1 src/test/scala/ArithmeticSpecs.scala
  23. +2 −2 src/test/scala/CompoundSpecs.scala
  24. +3 −3 src/test/scala/DisjunctionSpecs.scala
  25. +1 −1 src/test/scala/FilterSpecs.scala
  26. +2 −2 src/test/scala/LineStreamSpecs.scala
  27. +1 −1 src/test/scala/RegexSpecs.scala
  28. +1 −1 src/test/scala/RegexUtilsSpecs.scala
  29. +3 −3 src/test/scala/TerminalSpecs.scala
View
@@ -1,8 +1,8 @@
name := "gll-combinators"
-organization := "edu.uwm.cs"
+organization := "com.codecommit"
-version := "1.5-SNAPSHOT"
+version := "2.0-SNAPSHOT"
scalaVersion := "2.9.1"
@@ -1,7 +1,7 @@
package common
import scala.io.Source
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
trait Example[A] extends Parsers {
@@ -1,6 +1,6 @@
package arithmetic
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
import AST._
object ArithmeticParser extends common.Example[Expr] with RegexParsers {
@@ -1,7 +1,7 @@
package config
import scala.io.Source
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
/**
* Parses config files according to the Git format (ish). Unlike
@@ -3,7 +3,7 @@ package lambdacalc
import scala.io.Source
import scala.collection.mutable
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
import AST._
object LambdaCalcParser extends common.Example[(List[Alias], Expr)] with RegexParsers {
@@ -1,6 +1,6 @@
package miniml
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
object MiniMLParser extends common.Example[Any] with RegexParsers {
@@ -1,4 +1,4 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
private[gll] object Global {
val debug = false
@@ -1,4 +1,4 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
import java.io.{PrintStream, StringReader, Reader}
@@ -1,9 +1,9 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
import scala.collection.mutable
import mutable.{Buffer, ListBuffer}
-import edu.uwm.cs.util._
+import com.codecommit.util._
import Global._
@@ -1,6 +1,6 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
-import edu.uwm.cs.util._
+import com.codecommit.util._
import scala.util.matching.Regex
@@ -1,6 +1,6 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
-import edu.uwm.cs.util._
+import com.codecommit.util._
import scala.util.matching.Regex
@@ -1,4 +1,4 @@
-package edu.uwm.cs.gll.ast
+package com.codecommit.gll.ast
trait Filter[-A] extends (A => Boolean) { self =>
def unary_!(): Filter[A] = new Filter[A] {
@@ -1,6 +1,6 @@
-package edu.uwm.cs.gll.ast
+package com.codecommit.gll.ast
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
trait Filters {
def prec(order: Symbol*): Filter[Node] = new PrecedenceFilter(order)
@@ -1,4 +1,4 @@
-package edu.uwm.cs.gll.ast
+package com.codecommit.gll.ast
trait Node {
val label: Symbol
@@ -1,4 +1,4 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
import scala.util.matching.Regex
@@ -1,3 +1,3 @@
-package edu.uwm.cs.gll
+package com.codecommit.gll
case class ~[+A, +B](_1: A, _2: B) extends Product2[A, B]
@@ -1,4 +1,4 @@
-package edu.uwm.cs.util
+package com.codecommit.util
import collection.{SetLike, GenTraversableOnce}
import collection.generic.CanBuildFrom
@@ -1,11 +1,11 @@
-package edu.uwm.cs.util
+package com.codecommit.util
import collection.mutable
/**
* @author Jorge Ortiz
*/
-private[cs] class HOMap[K[_], V[_]] {
+private[codecommit] class HOMap[K[_], V[_]] {
private val underlying: mutable.Map[K[_], V[_]] = mutable.Map.empty
def add[T](key: K[T], value: V[T]) {
@@ -32,7 +32,7 @@ private[cs] class HOMap[K[_], V[_]] {
def contains(key: K[_]) = underlying.contains(key)
}
-private[cs] object HOMap {
+private[codecommit] object HOMap {
def apply[K[_], V[_]](tuples: (K[A], V[A]) forSome { type A } *) = {
val back = new HOMap[K, V]
tuples foreach { case (k, v) => back.add(k, v) }
@@ -1,6 +1,6 @@
-package edu.uwm.cs.util
+package com.codecommit.util
-private[cs] object SetSyntax {
+private[codecommit] object SetSyntax {
implicit def setSyntax[A](set: Set[A]): RichSet[A] = new RichSet(set)
class RichSet[A](set: Set[A]) {
@@ -1,4 +1,4 @@
-package edu.uwm.cs.util
+package com.codecommit.util
trait Thunkable {
protected def thunk[A](field: Symbol) = {
@@ -1,9 +1,9 @@
-package edu.uwm.cs.util
+package com.codecommit.util
import scala.collection.generic.CanBuildFrom
package object util {
- import edu.uwm.cs.util.ComplementarySet
+ import com.codecommit.util.ComplementarySet
implicit def createComplementarySetCanBuildFrom[A, B]: CanBuildFrom[ComplementarySet[A], B, ComplementarySet[B]] = new CanBuildFrom[ComplementarySet[A], B, ComplementarySet[B]] {
def apply = null
@@ -1,4 +1,4 @@
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
import org.specs._
import org.scalacheck._
@@ -1,5 +1,5 @@
-import edu.uwm.cs.gll._
-import edu.uwm.cs.util._
+import com.codecommit.gll._
+import com.codecommit.util._
import org.specs._
import org.scalacheck._
@@ -1,4 +1,4 @@
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
import org.specs._
import org.scalacheck._
@@ -60,7 +60,7 @@ object DisjunctionSpecs extends Specification with Parsers with ScalaCheck {
}
"compute FIRST for binary alternatives" in {
- import edu.uwm.cs.util._
+ import com.codecommit.util._
val prop = forAll { (left: String, right: String) =>
val leftFirst = if (left.length == 0) Set[Char]() else Set(left charAt 0)
@@ -193,7 +193,7 @@ object DisjunctionSpecs extends Specification with Parsers with ScalaCheck {
}
"compute FIRST for nary alternatives" in {
- import edu.uwm.cs.util._
+ import com.codecommit.util._
("daniel" | "chris" | "joseph").first mustEqual Set('d', 'c', 'j')
("daniel" | "daniel" | "chris" | "joseph").first mustEqual Set('d', 'c', 'j')
@@ -1,4 +1,4 @@
-import edu.uwm.cs.gll
+import com.codecommit.gll
import gll._
import gll.ast._
@@ -1,5 +1,5 @@
-import edu.uwm.cs.gll.LazyLineCons
-import edu.uwm.cs.gll.LineStream
+import com.codecommit.gll.LazyLineCons
+import com.codecommit.gll.LineStream
import scala.io.Source
@@ -1,4 +1,4 @@
-import edu.uwm.cs._
+import com.codecommit._
import gll._
import util._
@@ -1,4 +1,4 @@
-import edu.uwm.cs._
+import com.codecommit._
import gll._
import util._
@@ -1,4 +1,4 @@
-import edu.uwm.cs.gll._
+import com.codecommit.gll._
import org.specs._
import org.scalacheck._
@@ -86,7 +86,7 @@ object TerminalSpecs extends Specification with ScalaCheck with Parsers {
}
"compute FIRST set" in {
- import edu.uwm.cs.util.UniversalCharSet
+ import com.codecommit.util.UniversalCharSet
val prop = forAll { s: String =>
if (s.length == 0)
@@ -197,7 +197,7 @@ object TerminalSpecs extends Specification with ScalaCheck with Parsers {
}
"compute FIRST set" in {
- import edu.uwm.cs.util.UniversalCharSet
+ import com.codecommit.util.UniversalCharSet
val prop = forAll { strs: List[String] =>
(strs.length > 0 && (strs exists { _.length > 0 })) ==> {

0 comments on commit 2c30ffe

Please sign in to comment.