db0f872 · elk · git.iko.soy

git.iko.soy/elk

Make changes to get elm-reactor working

commitdb0f872cc14762610b6496bfb8f61f034c3b2d9c authorEvan Czaplicki <info@elm-lang.org> dateWed 19 Nov 2014, 01:26 (12 years ago) parentce40d5e

4 files changed+21−9

compare with master

unifiedsplit

elm-compiler.cabal+1 runtime/core.js+3−3 runtime/debug.js+5−5 src/Elm/Compiler.hs+12−1

elm-compiler.cabal+1

@@ -29,6 +29,7 @@ Build-type: Simple

2929

3030Data-files:

3131 runtime/core.js

32+ runtime/debug.js

3233

3334source-repository head

3435 type: git

runtime/core.js+3−3

@@ -1,5 +1,5 @@

2−var Elm = {

2+var Elm = Elm || {

33 Native: {}

44};

@@ -281,7 +281,7 @@ function initGraphics(elm, Module) {

281281 var signalGraph = Module.main;

282282

283283 // make sure the signal graph is actually a signal & extract the visual model

284− var Signal = Elm.Native.Signal.make(elm);

284+ var Signal = Elm.Signal.make(elm);

285285 if (!('recv' in signalGraph)) {

286286 signalGraph = Signal.constant(signalGraph);

287287 }

@@ -301,7 +301,7 @@ function initGraphics(elm, Module) {

301301 savedScene = newScene;

302302 });

303303 }

304− var renderer = A2(Signal.lift, domUpdate, signalGraph);

304+ var renderer = A2(Signal.map, domUpdate, signalGraph);

305305

306306 // must check for resize after 'renderer' is created so

307307 // that changes show up.

runtime/debug.js+5−5

@@ -8,18 +8,18 @@ if (typeof window != 'undefined' && !window.location.origin) {

88 (window.location.port ? (':' + window.location.port) : '');

99}

1010

11−Elm.fullscreenDebugHooks = function(module, debuggerHistory /* =undefined */) {

11+Elm.fullscreenDebugHooks = function(elmModule, debuggerHistory /* =undefined */) {

1212 var exposedDebugger = {};

13− function debuggerAttach(module, debuggerHistory) {

13+ function debuggerAttach(elmModule, debuggerHistory) {

1414 return {

1515 make: function(runtime) {

16− var wrappedModule = debugModule(module, runtime);

16+ var wrappedModule = debugModule(elmModule, runtime);

1717 exposedDebugger = debuggerInit(wrappedModule, runtime, debuggerHistory);

1818 return wrappedModule.debuggedModule;

1919 }

2020 }

2121 }

22− var mainHandle = Elm.fullscreen(debuggerAttach(module, debuggerHistory));

22+ var mainHandle = Elm.fullscreen(debuggerAttach(elmModule, debuggerHistory));

2323 mainHandle.debugger = exposedDebugger;

2424 return mainHandle;

2525};

@@ -419,7 +419,7 @@ function Point(x, y) {

419419function tracePathInit(runtime, signalGraphMain) {

420420 var List = Elm.List.make(runtime);

421421 var Signal = Elm.Signal.make(runtime);

422− var tracePathNode = A2(Signal.lift, graphicsUpdate, signalGraphMain);

422+ var tracePathNode = A2(Signal.map, graphicsUpdate, signalGraphMain);

423423 var tracePathCanvas = createCanvas();

424424 var tracePositions = {};

425425 var recordingTraces = true;

src/Elm/Compiler.hs+12−1

@@ -1,6 +1,10 @@

11{-# OPTIONS_GHC -Wall #-}

22{-# LANGUAGE FlexibleContexts #-}

3−module Elm.Compiler (version, parseDependencies, compile, runtimePath) where

3+module Elm.Compiler

4+ ( version

5+ , parseDependencies, compile

6+ , runtimePath, runtimeDebugPath

7+ ) where

59import Control.Monad.Error (MonadError, throwError)

610import qualified Data.List as List

@@ -75,3 +79,10 @@ compile user packageName source interfaces =

7579runtimePath :: IO FilePath

7680runtimePath =

7781 Utils.getAsset "compiler" Paths.getDataFileName "runtime/core.js"

82+

83+

84+{-| Path to the debugger runtime.

85+-}

86+runtimeDebugPath :: IO FilePath

87+runtimeDebugPath =

88+ Utils.getAsset "compiler" Paths.getDataFileName "runtime/debug.js"