Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: asami/AsakusaScalaDslSample
base: master
...
head fork: Yasushi/AsakusaScalaDslSample
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 11 files changed
  • 0 commit comments
  • 1 contributor
View
5 .gitignore
@@ -0,0 +1,5 @@
+lib_managed/
+project/boot/
+project/plugins/*_managed/
+project/plugins/project/
+target/
View
8 project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+#Wed Mar 09 12:07:36 JST 2011
+project.organization=asd
+project.name=asd
+sbt.version=0.7.5.RC0
+project.version=1.0
+build.scala.versions=2.8.1
+project.initialize=false
View
2  sbt
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec java -Xmx512M -Xss512k -jar `dirname $0`/sbt-launch-0.7.5.RC0.jar "$@"
View
BIN  sbt-launch-0.7.5.RC0.jar
Binary file not shown
View
18 src/main/scala/com/asakusafw/app/MyFlow.scala.bak
@@ -1,18 +0,0 @@
-package com.asakusafw.app
-
-import com.asakusafw.dsl._
-
-class MyInput extends DataSource
-class MyOutput extends DataSource
-class MyArtifact extends DataSource
-
-// 1.1
-class MyFlow extends Flow11 {
- type IN1 = MyInput
- type OUT1 = MyOutput
-
- start proc(op1) proc(op2) end
-
- val op1 = Operation11[MyInput, MyArtifact]
- val op2 = Operation11[MyArtifact, MyOutput]
-}
View
18 src/main/scala/com/asakusafw/app/MyFlow.scala.bak2
@@ -1,18 +0,0 @@
-package com.asakusafw.app
-
-import com.asakusafw.dsl._
-
-class MyInput extends DataSource
-class MyOutput extends DataSource
-class MyArtifact extends DataSource
-
-case object op1 extends Operation11[MyInput, MyArtifact]
-case object op2 extends Operation11[MyArtifact, MyOutput]
-
-// 1.1
-class MyFlow extends Flow11 {
- type IN1 = MyInput
- type OUT1 = MyOutput
-
- start proc11(op1) proc11(op2) end
-}
View
19 src/main/scala/com/asakusafw/app/MyFlow2.scala.bak
@@ -1,19 +0,0 @@
-package com.asakusafw.app
-
-import com.asakusafw.dsl._
-
-class MyArtifactAux extends DataSource
-
-// 1.24
-class MyFlow2 extends Flow11 {
- type IN1 = MyInput
- type OUT1 = MyOutput
-
- start proc(op1) proc(op2) end
-
- val c1 = channel('c1, opA) end
-
- val op1 = Operation12[MyInput, MyArtifact, MyArtifactAux](c1)
- val op2 = Operation21[MyArtifact, MyArtifactAux, MyOutput]('c1)
- val opA = Operation11[MyArtifactAux, MyArtifactAux]
-}
View
19 src/main/scala/com/asakusafw/app/MyFlow2.scala.bak2
@@ -1,19 +0,0 @@
-package com.asakusafw.app
-
-import com.asakusafw.dsl._
-
-class MyArtifactAux extends DataSource
-
-case class opp1(cout: Channel[MyArtifactAux]) extends Operation12[MyInput, MyArtifact, MyArtifactAux](cout)
-case class opp2(cin: Channel[MyArtifactAux]) extends Operation21[MyArtifact, MyArtifactAux, MyOutput](cin)
-case class oppA extends Operation11[MyArtifactAux, MyArtifactAux]
-
-// 1.24
-class MyFlow2 extends Flow11 {
- type IN1 = MyInput
- type OUT1 = MyOutput
-
- val ch = channel('ch) proc11(oppA) end
-
- start proc12(opp1(ch)) proc21(opp2(ch)) end
-}
View
18 src/main/scala/com/asakusafw/app/MyFlow3.scala.bak
@@ -1,18 +0,0 @@
-package com.asakusafw.app
-
-import com.asakusafw.dsl._
-
-class MyInput2 extends DataSource2[String, String]
-class MyOutput3 extends DataSource3[String, String, String]
-class MyArtifact4 extends DataSource4[String, String, String, String]
-
-// 2.16
-class MyFlow3 extends Flow11 {
- type IN1 = MyInput2
- type OUT1 = MyOutput3
-
- start proc(op1) proc(op2) end
-
- val op1 = Operation11[MyInput2, MyArtifact4]()
- val op2 = Operation11[MyArtifact4, MyOutput]()
-}
View
12 src/main/scala/com/asakusafw/dsl/DataSource.scala
@@ -4,20 +4,20 @@ package com.asakusafw.dsl
abstract class DataSource extends JavaDslLinkable {
}
-abstract class DataSource2[D1 <: DataSource, D2 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2]) extends DataSource {
+abstract class DataSource2[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest] extends DataSource {
}
-abstract class DataSource3[D1 <: DataSource, D2 <: DataSource, D3 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2], implicit val m3: Manifest[D3]) extends DataSource {
+abstract class DataSource3[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest, D3 <: DataSource:Manifest] extends DataSource {
}
-abstract class DataSource4[D1 <: DataSource, D2 <: DataSource, D3 <: DataSource, D4 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2], implicit val m3: Manifest[D3], implicit val m4: Manifest[D4]) extends DataSource {
+abstract class DataSource4[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest, D3 <: DataSource:Manifest, D4 <: DataSource:Manifest] extends DataSource {
}
-abstract class DataSource5[D1 <: DataSource, D2 <: DataSource, D3 <: DataSource, D4 <: DataSource, D5 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2], implicit val m3: Manifest[D3], implicit val m4: Manifest[D4], implicit val m5: Manifest[D5]) extends DataSource {
+abstract class DataSource5[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest, D3 <: DataSource:Manifest, D4 <: DataSource:Manifest, D5 <: DataSource:Manifest] extends DataSource {
}
-abstract class DataSource6[D1 <: DataSource, D2 <: DataSource, D3 <: DataSource, D4 <: DataSource, D5 <: DataSource, D6 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2], implicit val m3: Manifest[D3], implicit val m4: Manifest[D4], implicit val m5: Manifest[D5], implicit val m6: Manifest[D6]) extends DataSource {
+abstract class DataSource6[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest, D3 <: DataSource:Manifest, D4 <: DataSource:Manifest, D5 <: DataSource:Manifest, D6 <: DataSource:Manifest] extends DataSource {
}
-abstract class DataSource7[D1 <: DataSource, D2 <: DataSource, D3 <: DataSource, D4 <: DataSource, D5 <: DataSource, D6 <: DataSource, D7 <: DataSource](implicit val m1: Manifest[D1], implicit val m2: Manifest[D2], implicit val m3: Manifest[D3], implicit val m4: Manifest[D4], implicit val m5: Manifest[D5], implicit val m6: Manifest[D6], implicit val m7: Manifest[D7]) extends DataSource {
+abstract class DataSource7[D1 <: DataSource:Manifest, D2 <: DataSource:Manifest, D3 <: DataSource:Manifest, D4 <: DataSource:Manifest, D5 <: DataSource:Manifest, D6 <: DataSource:Manifest, D7 <: DataSource:Manifest] extends DataSource {
}
View
18 src/main/scala/com/asakusafw/dsl/Flow.scala
@@ -164,20 +164,20 @@ class FlowNode3[FIN1 <: DataSource, FIN2 <: DataSource, FIN3 <: DataSource](prev
abstract class Operation(val ports: List[Port[_]]) extends JavaDslLinkable
-class Operation11[FIN1 <: DataSource, FOUT1 <: DataSource](implicit val min1: Manifest[FIN1], implicit val mout1: Manifest[FOUT1]) extends Operation(Nil)
+class Operation11[FIN1 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest] extends Operation(Nil)
-class Operation12[FIN1 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource](cout2: Port[FOUT2])(implicit val min1: Manifest[FIN1], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2]) extends Operation(List(cout2))
+class Operation12[FIN1 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest](cout2: Port[FOUT2]) extends Operation(List(cout2))
-class Operation13[FIN1 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource, FOUT3 <: DataSource](cout2: Port[FOUT2], cout3: Port[FOUT3])(implicit val min1: Manifest[FIN1], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2], implicit val mout3: Manifest[FOUT3]) extends Operation(List(cout2, cout3))
+class Operation13[FIN1 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest, FOUT3 <: DataSource:Manifest](cout2: Port[FOUT2], cout3: Port[FOUT3]) extends Operation(List(cout2, cout3))
-class Operation21[FIN1 <: DataSource, FIN2 <: DataSource, FOUT1 <: DataSource](cin2: Port[FIN2])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val mout1: Manifest[FOUT1]) extends Operation(List(cin2))
+class Operation21[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest](cin2: Port[FIN2]) extends Operation(List(cin2))
-class Operation22[FIN1 <: DataSource, FIN2 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource](cin2: Port[FIN2], cout2: Port[FOUT2])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2]) extends Operation(List(cin2, cout2))
+class Operation22[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest](cin2: Port[FIN2], cout2: Port[FOUT2]) extends Operation(List(cin2, cout2))
-class Operation23[FIN1 <: DataSource, FIN2 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource, FOUT3 <: DataSource](cin2: Port[FIN2], cout2: Port[FOUT2], cout3: Port[FOUT3])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2], implicit val mout3: Manifest[FOUT3]) extends Operation(List(cin2, cout2, cout3))
+class Operation23[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest, FOUT3 <: DataSource:Manifest](cin2: Port[FIN2], cout2: Port[FOUT2], cout3: Port[FOUT3]) extends Operation(List(cin2, cout2, cout3))
-class Operation31[FIN1 <: DataSource, FIN2 <: DataSource, FIN3 <: DataSource, FOUT1 <: DataSource](cin2: Port[FIN2], cin3: Port[FIN3])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val min3: Manifest[FIN3], implicit val mout1: Manifest[FOUT1]) extends Operation(List(cin2, cin3))
+class Operation31[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FIN3 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest](cin2: Port[FIN2], cin3: Port[FIN3]) extends Operation(List(cin2, cin3))
-class Operation32[FIN1 <: DataSource, FIN2 <: DataSource, FIN3 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource](cin2: Port[FIN2], cin3: Port[FIN3], cout2: Port[FOUT2])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val min3: Manifest[FIN3], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2]) extends Operation(List(cin2, cin3, cout2))
+class Operation32[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FIN3 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest](cin2: Port[FIN2], cin3: Port[FIN3], cout2: Port[FOUT2]) extends Operation(List(cin2, cin3, cout2))
-class Operation33[FIN1 <: DataSource, FIN2 <: DataSource, FIN3 <: DataSource, FOUT1 <: DataSource, FOUT2 <: DataSource, FOUT3 <: DataSource](cin2: Port[FIN2], cin3: Port[FIN3], cout2: Port[FOUT2], cout3: Port[FOUT3])(implicit val min1: Manifest[FIN1], implicit val min2: Manifest[FIN2], implicit val min3: Manifest[FIN3], implicit val mout1: Manifest[FOUT1], implicit val mout2: Manifest[FOUT2], implicit val mout3: Manifest[FOUT3]) extends Operation(List(cin2, cin3, cout2, cout3))
+class Operation33[FIN1 <: DataSource:Manifest, FIN2 <: DataSource:Manifest, FIN3 <: DataSource:Manifest, FOUT1 <: DataSource:Manifest, FOUT2 <: DataSource:Manifest, FOUT3 <: DataSource:Manifest](cin2: Port[FIN2], cin3: Port[FIN3], cout2: Port[FOUT2], cout3: Port[FOUT3]) extends Operation(List(cin2, cin3, cout2, cout3))

No commit comments for this range

Something went wrong with that request. Please try again.