From 3105ab1372ee505a72779ff7bf06d94a9dcdadb7 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Tue, 16 Jul 2019 18:45:39 -0700
Subject: [PATCH] Move runtime to toplevel

---
 experiments/modern/src/{maki-interpreter => }/Emitter.js      | 0
 experiments/modern/src/debugger/Variable.js                   | 2 +-
 experiments/modern/src/debugger/index.js                      | 4 ++--
 experiments/modern/src/maki-interpreter/interpreter.test.js   | 4 ++--
 experiments/modern/src/maki-interpreter/prettyPrinter.js      | 2 +-
 experiments/modern/src/maki-interpreter/variable.js           | 2 +-
 .../modern/src/{maki-interpreter => }/runtime/Group.js        | 0
 .../modern/src/{maki-interpreter => }/runtime/GuiObject.js    | 0
 .../modern/src/{maki-interpreter => }/runtime/MakiObject.js   | 0
 .../modern/src/{maki-interpreter => }/runtime/System.js       | 0
 .../modern/src/{maki-interpreter => }/runtime/index.js        | 0
 11 files changed, 7 insertions(+), 7 deletions(-)
 rename experiments/modern/src/{maki-interpreter => }/Emitter.js (100%)
 rename experiments/modern/src/{maki-interpreter => }/runtime/Group.js (100%)
 rename experiments/modern/src/{maki-interpreter => }/runtime/GuiObject.js (100%)
 rename experiments/modern/src/{maki-interpreter => }/runtime/MakiObject.js (100%)
 rename experiments/modern/src/{maki-interpreter => }/runtime/System.js (100%)
 rename experiments/modern/src/{maki-interpreter => }/runtime/index.js (100%)

diff --git a/experiments/modern/src/maki-interpreter/Emitter.js b/experiments/modern/src/Emitter.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/Emitter.js
rename to experiments/modern/src/Emitter.js
diff --git a/experiments/modern/src/debugger/Variable.js b/experiments/modern/src/debugger/Variable.js
index 8029335a..4079ed49 100644
--- a/experiments/modern/src/debugger/Variable.js
+++ b/experiments/modern/src/debugger/Variable.js
@@ -1,4 +1,4 @@
-import runtime from "../maki-interpreter/runtime";
+import runtime from "../runtime";
 
 function quote(str) {
   return `"${str}"`;
diff --git a/experiments/modern/src/debugger/index.js b/experiments/modern/src/debugger/index.js
index d7b98181..90e13e99 100644
--- a/experiments/modern/src/debugger/index.js
+++ b/experiments/modern/src/debugger/index.js
@@ -1,7 +1,7 @@
 import React from "react";
 import run from "../maki-interpreter/interpreter";
-import System from "../maki-interpreter/runtime/System";
-import runtime from "../maki-interpreter/runtime";
+import System from "../runtime/System";
+import runtime from "../runtime";
 import Variable from "./Variable";
 import Value from "./Value";
 import Command from "./Command";
diff --git a/experiments/modern/src/maki-interpreter/interpreter.test.js b/experiments/modern/src/maki-interpreter/interpreter.test.js
index 0b188a6e..a5aee457 100644
--- a/experiments/modern/src/maki-interpreter/interpreter.test.js
+++ b/experiments/modern/src/maki-interpreter/interpreter.test.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
-const System = require("./runtime/System");
-const runtime = require("./runtime");
+const System = require("../runtime/System");
+const runtime = require("../runtime");
 const interpret = require("./interpreter");
 
 const VERSIONS = {
diff --git a/experiments/modern/src/maki-interpreter/prettyPrinter.js b/experiments/modern/src/maki-interpreter/prettyPrinter.js
index e4de77fd..eed9be38 100644
--- a/experiments/modern/src/maki-interpreter/prettyPrinter.js
+++ b/experiments/modern/src/maki-interpreter/prettyPrinter.js
@@ -1,5 +1,5 @@
 const Variable = require("./variable");
-const runtime = require("./runtime");
+const runtime = require("../runtime");
 
 // Debug utility to pretty print a value/variable
 function printValue(value) {
diff --git a/experiments/modern/src/maki-interpreter/variable.js b/experiments/modern/src/maki-interpreter/variable.js
index 75be3fda..e0a60162 100644
--- a/experiments/modern/src/maki-interpreter/variable.js
+++ b/experiments/modern/src/maki-interpreter/variable.js
@@ -1,4 +1,4 @@
-const Emitter = require("./Emitter");
+const Emitter = require("../Emitter");
 
 class Variable {
   constructor({ type, typeName }) {
diff --git a/experiments/modern/src/maki-interpreter/runtime/Group.js b/experiments/modern/src/runtime/Group.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/runtime/Group.js
rename to experiments/modern/src/runtime/Group.js
diff --git a/experiments/modern/src/maki-interpreter/runtime/GuiObject.js b/experiments/modern/src/runtime/GuiObject.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/runtime/GuiObject.js
rename to experiments/modern/src/runtime/GuiObject.js
diff --git a/experiments/modern/src/maki-interpreter/runtime/MakiObject.js b/experiments/modern/src/runtime/MakiObject.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/runtime/MakiObject.js
rename to experiments/modern/src/runtime/MakiObject.js
diff --git a/experiments/modern/src/maki-interpreter/runtime/System.js b/experiments/modern/src/runtime/System.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/runtime/System.js
rename to experiments/modern/src/runtime/System.js
diff --git a/experiments/modern/src/maki-interpreter/runtime/index.js b/experiments/modern/src/runtime/index.js
similarity index 100%
rename from experiments/modern/src/maki-interpreter/runtime/index.js
rename to experiments/modern/src/runtime/index.js