Merged in changeGroupToSlide (pull request #177)

rename group to slide in view Approved-by: Larisa Stoltzfus <larisa.stoltzfus@gmail.com> Approved-by: Michel Steuwer <michel.steuwer@glasgow.ac.uk>
lift-project · May 17, 2018 · e3c0c97 · e3c0c97
2 parents 44e73a2 + b8adba4
commit e3c0c97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/ir/view/InputView.scala b/src/main/ir/view/InputView.scala
@@ -77,7 +77,7 @@ object InputView {
       case asVector(n) => buildViewAsVector(n, argView)
       case _: asScalar => buildViewAsScalar(argView)
       case f: Filter => buildViewFilter(call, argView)
-      case g: Slide => buildViewGroup(g, call, argView)
+      case g: Slide => buildViewSlide(g, call, argView)
       case h: Head => buildViewHead(call, argView)
       case h: Tail => buildViewTail(call, argView)
       case uaa: UnsafeArrayAccess => buildViewUnsafeArrayAccess(uaa, call, argView)
@@ -101,7 +101,7 @@ object InputView {
     argView.get(n)
   }
 
-  private def buildViewGroup(g: Slide, call: FunCall, argView: View): View = {
+  private def buildViewSlide(g: Slide, call: FunCall, argView: View): View = {
     argView.slide(g)
   }
 

diff --git a/src/main/ir/view/View.scala b/src/main/ir/view/View.scala
@@ -279,7 +279,7 @@ abstract sealed class View(val t: Type = UndefType) {
     this.t match {
       case ArrayType(_) =>
         ViewSlide(this, s, s.checkType(this.t, setType=false))
-      case other => throw new IllegalArgumentException("Can't group " + other)
+      case other => throw new IllegalArgumentException("Can't slide" + other)
     }
   }