Skip to content

Commit

Permalink
Update license comments and other top-level comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
sjrd committed Oct 10, 2013
1 parent 9ff4dc0 commit a6b4033
Show file tree
Hide file tree
Showing 27 changed files with 156 additions and 49 deletions.
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2013 EPFL

All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the EPFL nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
package backend
package js
Expand All @@ -7,7 +12,10 @@ import scala.reflect.internal.pickling.PickleBuffer

import java.io.PrintWriter

/** Send JS ASTs to files */
/** Send JS ASTs to files
*
* @author Sébastien Doeraene
*/
trait GenJSFiles extends SubComponent { self: GenJSCode =>
import global._
import jsAddons._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down Expand Up @@ -77,6 +77,8 @@ package js
* * pushLhsInto() for statement-or-expression constructs
* * Rule 2) is implemented by pushLhsInto()
* * Class desugaring is in transformClass() and its helpers
*
* @author Sébastien Doeraene
*/
trait JSDesugaring extends SubComponent { self: GenJSCode =>
import global._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand All @@ -9,6 +9,8 @@ package backend.js
import scalajs._

/** Extension of ScalaPrimitives for primitives only relevant to the JS backend
*
* @author Sébastie Doeraene
*/
abstract class JSPrimitives {
val global: Global
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand All @@ -12,6 +12,10 @@ import scala.collection.mutable.{ ListBuffer, HashMap, Stack, StringBuilder }

import scala.reflect.internal.util.SourceFile

/** Printers and source map emitters for JavaScript ASTs
*
* @author Sébastien Doeraene
*/
trait JSPrinters { self: scalajs.JSGlobalAddons =>
import global._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
package scalajs

import scala.reflect.internal.SymbolTable

/** Core definitions for Scala.js
*
* @author Sébastien Doeraene
Expand All @@ -18,14 +16,7 @@ trait JSDefinitions { self: JSGlobalAddons =>
object jsDefinitions extends JSDefinitionsClass

import definitions._

import rootMirror.{
getClassByName, getRequiredClass, getClassIfDefined,
getModuleByName, getRequiredModule, getModuleIfDefined,
getRequiredPackage,
getPackageObject, getPackageObjectIfDefined,
requiredClass, requiredModule
}
import rootMirror._

class JSDefinitionsClass {
lazy val MaybeJSAnyClass = getClassIfDefined("scala.js.Any")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand All @@ -10,7 +10,7 @@ import backend.js._

import util.returning

/** Additions to Global for the JavaScript backend
/** A specialized Global that enables the JavaScript backend by default
*
* @author Sébastien Doeraene
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
package scalajs

import backend.js._

/** Additions to Global meaningful for the JavaScript backend
*
* @author Sébastien Doeraene
*/
trait JSGlobalAddons extends JSTrees with JSPrinters with JSDefinitions {
val global: Global

Expand Down
8 changes: 4 additions & 4 deletions compiler/src/main/scala/scala/tools/nsc/scalajs/Main.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* NSC -- new Scala compiler
* Copyright 2005-2013 LAMP/EPFL
* @author Martin Odersky
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
Expand All @@ -11,7 +11,7 @@ import java.io.File.pathSeparator
import scala.tools.nsc.interactive.{ RefinedBuildManager, SimpleBuildManager }
import scala.tools.nsc.io.AbstractFile

/** The main object a variant of the compiler targeting JavaScript
/** The main object, a variant of the compiler targeting JavaScript
*
* @author Sébastien Doeraene
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js compiler
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package scala.tools.nsc
package scalajs

Expand All @@ -6,6 +11,10 @@ import scala.tools.nsc.plugins.{
}
import scala.collection.{ mutable, immutable }

/** Main entry point for the Scala.js compiler plugin
*
* @author Sébastien Doeraene
*/
class ScalaJSPlugin(val global: Global) extends NscPlugin {
import global._

Expand Down
5 changes: 5 additions & 0 deletions corejslib/DummyParents.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js runtime support
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

/** @constructor */
ScalaJS.inheritable.java\ufe33beans\ufe33SimpleBeanInfo = function() {};
/** @constructor */
Expand Down
5 changes: 5 additions & 0 deletions corejslib/javalangObject.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js runtime support
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

/* ------------------
* java.lang.Object
* ------------------ */
Expand Down
5 changes: 5 additions & 0 deletions corejslib/javalangString.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js runtime support
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

/* ------------------
* java.lang.String
* ------------------ */
Expand Down
5 changes: 5 additions & 0 deletions corejslib/scalajsenv.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js runtime support
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

/* ---------------------------------- *
* The top-level Scala.js environment *
* ---------------------------------- */
Expand Down
5 changes: 5 additions & 0 deletions examples/helloworld/HelloWorld.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js example code
* Public domain
* @author Sébastien Doeraene
*/

package helloworld

import scala.js
Expand Down
5 changes: 5 additions & 0 deletions examples/helloworld/startup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js example code
* Public domain
* @author Sébastien Doeraene
*/

$(function() {
ScalaJS.modules.helloworld\ufe33HelloWorld().main();
});
5 changes: 5 additions & 0 deletions examples/reversi/JSTypes.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js example code
* Public domain
* @author Sébastien Doeraene
*/

package reversi

import scala.js
Expand Down
5 changes: 5 additions & 0 deletions examples/reversi/Reversi.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js example code
* Public domain
* @author Sébastien Doeraene
*/

package reversi

import scala.language.implicitConversions
Expand Down
5 changes: 5 additions & 0 deletions examples/reversi/startup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js example code
* Public domain
* @author Sébastien Doeraene
*/

$(function() {
var mainInstance = new ScalaJS.classes.reversi\ufe33Reversi(
jQuery, jQuery("#playground"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js sbt plugin
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package ch.epfl.lamp.sbtscalajs

import scala.language.implicitConversions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js sbt plugin
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package ch.epfl.lamp.sbtscalajs

import sbt._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* Scala.js sbt plugin
* Copyright 2013 LAMP/EPFL
* @author Sébastien Doeraene
*/

package ch.epfl.lamp.sbtscalajs

import sbt._
Expand Down

0 comments on commit a6b4033

Please sign in to comment.