diff options
27 files changed, 30 insertions, 28 deletions
diff --git a/config/list/library.lst b/config/list/library.lst index f1ad7ba66e..2e2cebf101 100644 --- a/config/list/library.lst +++ b/config/list/library.lst @@ -14,7 +14,7 @@ Cell.scala Char.java Console.scala Double.java -Executable.scala +Application.scala Float.java Function0.java Function1.java diff --git a/sources/examples/ComputeServer.scala b/sources/examples/ComputeServer.scala index 034b996498..bd79403149 100644 --- a/sources/examples/ComputeServer.scala +++ b/sources/examples/ComputeServer.scala @@ -35,7 +35,7 @@ class ComputeServer(n: Int) { spawn(replicate(0, n) { processor }) } -object Test with Executable { +object Test with Application { val server = new ComputeServer(1); val f = server.future(42); Console.println(f()) diff --git a/sources/examples/pilib/piNat.scala b/sources/examples/pilib/piNat.scala index 5fd2dde385..b3364227c2 100644 --- a/sources/examples/pilib/piNat.scala +++ b/sources/examples/pilib/piNat.scala @@ -2,7 +2,7 @@ import scala.concurrent.pilib._; //import pilib._; /** Church encoding of naturals in the Pi-calculus */ -object piNat with Executable { +object piNat with Application { /** Locations of Pi-calculus natural */ class NatChan extends Chan[Triple[Chan[unit], Chan[NatChan], Chan[NatChan]]]; diff --git a/sources/examples/pilib/twoPlaceBuffer.scala b/sources/examples/pilib/twoPlaceBuffer.scala index ad0ab60307..670c879ce6 100644 --- a/sources/examples/pilib/twoPlaceBuffer.scala +++ b/sources/examples/pilib/twoPlaceBuffer.scala @@ -1,7 +1,7 @@ import scala.concurrent.pilib._; /** Two-place buffer specification and implementation. */ -object twoPlaceBuffer with Executable { +object twoPlaceBuffer with Application { /** * Specification. diff --git a/support/latex/scaladoc.sty b/support/latex/scaladoc.sty index 0112ef2094..c5c29eecbc 100644 --- a/support/latex/scaladoc.sty +++ b/support/latex/scaladoc.sty @@ -94,8 +94,10 @@ \fancypagestyle{plain}{\fancyhf{}% \renewcommand{\headrulewidth}{0pt}% \renewcommand{\footrulewidth}{0pt}} -\@ifundefined{chaptermark}{}{% - \renewcommand{\chaptermark}[1]{\markboth{#1}{}}} +%\newcommand{\setupChaptermark}{% + \renewcommand{\chaptermark}[1]{\markboth{#1}{}}% +%} +%\@ifundefined{chaptermark}{}{\setupChaptermark} \renewcommand{\sectionmark}[1]{\markright{\thesection\ \ #1}} \fancyhf{} \fancyhead[LE,RO]{\sffamily\footnotesize\thepage} diff --git a/test/files/neg/bug145.scala b/test/files/neg/bug145.scala index 5845393ac8..da66ddba05 100644 --- a/test/files/neg/bug145.scala +++ b/test/files/neg/bug145.scala @@ -11,7 +11,7 @@ class C extends B[Int] { override def foo(x: Int): Int = x; } class D extends C with I[Int]; -object T with Executable { +object T with Application { System.out.println((new D).foo(3)); } diff --git a/test/files/neg/bug170.scala b/test/files/neg/bug170.scala index b1f712804e..8e66a2e451 100644 --- a/test/files/neg/bug170.scala +++ b/test/files/neg/bug170.scala @@ -10,6 +10,6 @@ class D extends J with I { abstract override def foo(): Unit = super.foo(); } -object Test with Executable { +object Test with Application { (new D).foo(); } diff --git a/test/files/neg/bug191.scala b/test/files/neg/bug191.scala index 1ff566137e..21e45b88e0 100644 --- a/test/files/neg/bug191.scala +++ b/test/files/neg/bug191.scala @@ -10,6 +10,6 @@ class B extends A { } foo(new C); } -object Main with Executable { +object Main with Application { val b = new B; } diff --git a/test/files/pos/abstract-data.scala b/test/files/pos/abstract-data.scala index f3d4a966bb..eaa23b6834 100644 --- a/test/files/pos/abstract-data.scala +++ b/test/files/pos/abstract-data.scala @@ -17,7 +17,7 @@ trait Base { } } -object testBase extends Base with Executable { +object testBase extends Base with Application { type exp = Exp; val term = new Num(2); System.out.println(term.eval); diff --git a/test/files/pos/bug115.scala b/test/files/pos/bug115.scala index 7e83038c7c..87a5c10915 100644 --- a/test/files/pos/bug115.scala +++ b/test/files/pos/bug115.scala @@ -3,6 +3,6 @@ class S[A](f: A => A, x: A) { } class T[A](f: A => A, y: A) extends S(x: A => f(x), y) { } -object Test with Executable { +object Test with Application { new T[int](x: int => x * 2, 1); } diff --git a/test/files/pos/bug210.scala b/test/files/pos/bug210.scala index f6a4580e33..20450335f4 100644 --- a/test/files/pos/bug210.scala +++ b/test/files/pos/bug210.scala @@ -10,7 +10,7 @@ trait Lang2 extends Lang1 { class Eval2: Visitor extends Eval1; } /* -object Main with Executable { +object Main with Application { val lang2 = new Lang2 {}; val eval = new lang2.Eval2; } diff --git a/test/files/pos/bug211.scala b/test/files/pos/bug211.scala index df633d7ade..6c5b73ec4a 100644 --- a/test/files/pos/bug211.scala +++ b/test/files/pos/bug211.scala @@ -1,7 +1,7 @@ trait A; trait B; class Foo: (A with B) extends A with B; -object Test with Executable { +object Test with Application { new Foo(); System.out.println("bug211 completed"); } diff --git a/test/files/pos/bug267.scala b/test/files/pos/bug267.scala index 1b65aa75a1..3c220e5df1 100644 --- a/test/files/pos/bug267.scala +++ b/test/files/pos/bug267.scala @@ -17,7 +17,7 @@ trait Base { } } -object testBase extends Base with Executable { +object testBase extends Base with Application { type exp = Exp; val term = new Num(2); System.out.println(term.eval); diff --git a/test/files/pos/constfold.scala b/test/files/pos/constfold.scala index 91587296af..ef71285f72 100644 --- a/test/files/pos/constfold.scala +++ b/test/files/pos/constfold.scala @@ -5,7 +5,7 @@ object A { val s = "z is " + z; } -object Test with Executable { +object Test with Application { System.out.println(A.x); System.out.println(A.y); diff --git a/test/files/pos/scoping1.scala b/test/files/pos/scoping1.scala index 7164b0cd28..c9bc14b563 100644 --- a/test/files/pos/scoping1.scala +++ b/test/files/pos/scoping1.scala @@ -1,4 +1,4 @@ -object This with Executable { +object This with Application { trait A { def foo(): unit; } diff --git a/test/files/run/bugs.scala b/test/files/run/bugs.scala index bb3bb7f1d8..63ee85ef47 100644 --- a/test/files/run/bugs.scala +++ b/test/files/run/bugs.scala @@ -352,7 +352,7 @@ class Bug266BB extends Bug266BA { val in = 3; } -object Bug266BTest with Executable { +object Bug266BTest with Application { val a: Bug266BA1 = new Bug266BA1 with Bug266BB; a.mkP.f(a.in); } diff --git a/test/files/run/map_test.scala b/test/files/run/map_test.scala index 709a7e0233..86430f10a9 100644 --- a/test/files/run/map_test.scala +++ b/test/files/run/map_test.scala @@ -3,7 +3,7 @@ import scala.collection.immutable.TreeMap; import scala.collection.immutable.ListMap; import scala.collection.immutable.Order; -object Test with Executable { +object Test with Application { val intOrder = Order.make((x:int,y:int) => x < y); diff --git a/test/neg/bug145.scala b/test/neg/bug145.scala index 5845393ac8..da66ddba05 100644 --- a/test/neg/bug145.scala +++ b/test/neg/bug145.scala @@ -11,7 +11,7 @@ class C extends B[Int] { override def foo(x: Int): Int = x; } class D extends C with I[Int]; -object T with Executable { +object T with Application { System.out.println((new D).foo(3)); } diff --git a/test/neg/bug170.scala b/test/neg/bug170.scala index b1f712804e..8e66a2e451 100644 --- a/test/neg/bug170.scala +++ b/test/neg/bug170.scala @@ -10,6 +10,6 @@ class D extends J with I { abstract override def foo(): Unit = super.foo(); } -object Test with Executable { +object Test with Application { (new D).foo(); } diff --git a/test/neg/bug191.scala b/test/neg/bug191.scala index 1ff566137e..21e45b88e0 100644 --- a/test/neg/bug191.scala +++ b/test/neg/bug191.scala @@ -10,6 +10,6 @@ class B extends A { } foo(new C); } -object Main with Executable { +object Main with Application { val b = new B; } diff --git a/test/pos/abstract-data.scala b/test/pos/abstract-data.scala index f3d4a966bb..eaa23b6834 100644 --- a/test/pos/abstract-data.scala +++ b/test/pos/abstract-data.scala @@ -17,7 +17,7 @@ trait Base { } } -object testBase extends Base with Executable { +object testBase extends Base with Application { type exp = Exp; val term = new Num(2); System.out.println(term.eval); diff --git a/test/pos/bug115.scala b/test/pos/bug115.scala index 7e83038c7c..87a5c10915 100644 --- a/test/pos/bug115.scala +++ b/test/pos/bug115.scala @@ -3,6 +3,6 @@ class S[A](f: A => A, x: A) { } class T[A](f: A => A, y: A) extends S(x: A => f(x), y) { } -object Test with Executable { +object Test with Application { new T[int](x: int => x * 2, 1); } diff --git a/test/pos/bug210.scala b/test/pos/bug210.scala index f6a4580e33..20450335f4 100644 --- a/test/pos/bug210.scala +++ b/test/pos/bug210.scala @@ -10,7 +10,7 @@ trait Lang2 extends Lang1 { class Eval2: Visitor extends Eval1; } /* -object Main with Executable { +object Main with Application { val lang2 = new Lang2 {}; val eval = new lang2.Eval2; } diff --git a/test/pos/bug211.scala b/test/pos/bug211.scala index df633d7ade..6c5b73ec4a 100644 --- a/test/pos/bug211.scala +++ b/test/pos/bug211.scala @@ -1,7 +1,7 @@ trait A; trait B; class Foo: (A with B) extends A with B; -object Test with Executable { +object Test with Application { new Foo(); System.out.println("bug211 completed"); } diff --git a/test/pos/bug267.scala b/test/pos/bug267.scala index 1b65aa75a1..3c220e5df1 100644 --- a/test/pos/bug267.scala +++ b/test/pos/bug267.scala @@ -17,7 +17,7 @@ trait Base { } } -object testBase extends Base with Executable { +object testBase extends Base with Application { type exp = Exp; val term = new Num(2); System.out.println(term.eval); diff --git a/test/pos/constfold.scala b/test/pos/constfold.scala index 91587296af..ef71285f72 100644 --- a/test/pos/constfold.scala +++ b/test/pos/constfold.scala @@ -5,7 +5,7 @@ object A { val s = "z is " + z; } -object Test with Executable { +object Test with Application { System.out.println(A.x); System.out.println(A.y); diff --git a/test/pos/scoping1.scala b/test/pos/scoping1.scala index 7164b0cd28..c9bc14b563 100644 --- a/test/pos/scoping1.scala +++ b/test/pos/scoping1.scala @@ -1,4 +1,4 @@ -object This with Executable { +object This with Application { trait A { def foo(): unit; } |