From 4f4432c78d26a8d3e5338f16a35ecd7d96cbe209 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sun, 17 Jan 2016 10:05:48 -0800 Subject: Fix some simple extra words The the word 'the' is often used twice. Fix that. --- src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala | 2 +- src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala | 2 +- src/compiler/scala/tools/nsc/transform/Constructors.scala | 2 +- src/compiler/scala/tools/nsc/transform/UnCurry.scala | 2 +- src/compiler/scala/tools/nsc/transform/patmat/Logic.scala | 2 +- src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala | 2 +- src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 +- src/reflect/scala/reflect/internal/Symbols.scala | 4 ++-- src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js | 6 +++--- src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala b/src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala index df8dcc690a..7aadd2c466 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/opt/BytecodeUtils.scala @@ -114,7 +114,7 @@ object BytecodeUtils { } def sameTargetExecutableInstruction(a: JumpInsnNode, b: JumpInsnNode): Boolean = { - // Compare next executable instead of the the labels. Identifies a, b as the same target: + // Compare next executable instead of the labels. Identifies a, b as the same target: // LabelNode(a) // LabelNode(b) // Instr diff --git a/src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala b/src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala index fb1799e092..a7ce7dfa04 100644 --- a/src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala +++ b/src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala @@ -248,7 +248,7 @@ abstract class ConstantOptimization extends SubComponent { new State(newVariables, stack.tail) } /** - * Load the specified local onto the top of the stack. An error the the local is uninitialized. + * Load the specified local onto the top of the stack. An error if the local is uninitialized. */ def load(variable: Local): State = { val contents: Contents = locals.getOrElse(variable, sys.error(s"$variable is not initialized")) diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala index 6a46c65267..b2aac587eb 100644 --- a/src/compiler/scala/tools/nsc/transform/Constructors.scala +++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala @@ -328,7 +328,7 @@ abstract class Constructors extends Statics with Transform with ast.TreeDSL { val delayedHook: DefDef = delayedEndpointDef(remainingConstrStats) defBuf += delayedHook val hookCallerClass = { - // transform to make the closure-class' default constructor assign the the outer instance to its param-accessor field. + // transform to make the closure-class' default constructor assign the outer instance to its param-accessor field. val drillDown = new ConstructorTransformer(unit) drillDown transform delayedInitClosure(delayedHook.symbol.asInstanceOf[MethodSymbol]) } diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index ee7c839de9..870c35338c 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -638,7 +638,7 @@ abstract class UnCurry extends InfoTransform * This transformation erases the dependent method types by: * - Widening the formal parameter type to existentially abstract * over the prior parameters (using `packSymbols`). This transformation - * is performed in the the `InfoTransform`er [[scala.reflect.internal.transform.UnCurry]]. + * is performed in the `InfoTransform`er [[scala.reflect.internal.transform.UnCurry]]. * - Inserting casts in the method body to cast to the original, * precise type. * diff --git a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala index 62d9c497ba..91777b34d5 100644 --- a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala +++ b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala @@ -542,7 +542,7 @@ trait ScalaLogic extends Interface with Logic with TreeAndTypeAnalysis { * * (0) A or B must be in the domain to draw any conclusions. * - * For example, knowing the the scrutinee is *not* true does not + * For example, knowing the scrutinee is *not* true does not * statically exclude it from being `X`, because that is an opaque * Boolean. * diff --git a/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala b/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala index 0574869714..9898cfd785 100644 --- a/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala +++ b/src/compiler/scala/tools/nsc/typechecker/AnalyzerPlugins.scala @@ -65,7 +65,7 @@ trait AnalyzerPlugins { self: Analyzer => * The hooks into `typeSig` allow analyzer plugins to add annotations to (or change the types * of) definition symbols. This cannot not be achieved by using `pluginsTyped`: this method * is only called during type checking, so changing the type of a symbol at this point is too - * late: references to the symbol might already be typed and therefore obtain the the original + * late: references to the symbol might already be typed and therefore obtain the original * type assigned during naming. * * @param defTree is the definition for which the type was computed. The different cases are diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index e73a4c6276..c2ff17452d 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -815,7 +815,7 @@ trait Contexts { self: Analyzer => val pre = if (qual.tpe.typeSymbol.isPackageClass) - // SI-6225 important if the imported symbol is inherited by the the package object. + // SI-6225 important if the imported symbol is inherited by the package object. singleType(qual.tpe, qual.tpe member nme.PACKAGE) else qual.tpe diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 4bdb8e6da8..11e740117d 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -56,7 +56,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => new FreeTypeSymbol(name, origin) initFlags flags /** - * This map stores the original owner the the first time the owner of a symbol is re-assigned. + * This map stores the original owner the first time the owner of a symbol is re-assigned. * The original owner of a symbol is needed in some places in the backend. Ideally, owners should * be versioned like the type history. */ @@ -500,7 +500,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => case _ => new StubTermSymbol(this, name.toTermName, missingMessage) } - /** Given a field, construct a term symbol that represents the source construct that gave rise the the field */ + /** Given a field, construct a term symbol that represents the source construct that gave rise the field */ def sugaredSymbolOrSelf = { val getter = getterIn(owner) if (getter == NoSymbol) { diff --git a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js index 4dd48675b7..d5e008d289 100644 --- a/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js +++ b/src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js @@ -752,7 +752,7 @@ $.layout.defaults = { * PANE-SPECIFIC SETTINGS * - options listed below MUST be specified per-pane - they CANNOT be set under 'panes' * - all options under the 'panes' key can also be set specifically for any pane - * - most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane + * - most options under the 'panes' key apply only to 'border-panes' - NOT the center-pane */ , north: { paneSelector: ".ui-layout-north" @@ -921,7 +921,7 @@ $.layout.backwardCompatibility = { $.extend(true, opts.panes, opts.defaults); delete opts.defaults; } - // rename options in the the options.panes key + // rename options in the options.panes key if (opts.panes) ren( opts.panes ); // rename options inside *each pane key*, eg: options.west $.each($.layout.config.allPanes, function (i, pane) { @@ -5483,4 +5483,4 @@ $.layout.onReady.push( $.layout.browserZoom._init ); -})( jQuery ); \ No newline at end of file +})( jQuery ); diff --git a/src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala b/src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala index 093899231e..86900f26c9 100644 --- a/src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala +++ b/src/scaladoc/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala @@ -248,7 +248,7 @@ trait DiagramFactory extends DiagramDirectiveParser { case _ => Nil }) - // Only show the the non-isolated nodes + // Only show the non-isolated nodes // TODO: Decide if we really want to hide package members, I'm not sure that's a good idea (!!!) // TODO: Does .distinct cause any stability issues? val sourceNodes = edges.map(_._1) -- cgit v1.2.3