wip renaming

Author: jefdaj

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "shortcut"]
-	path = shortcut
+	path = ortholang
 	url = [email protected]:jefdaj/shortcut.git

Docs.cabal

@@ -29,7 +29,7 @@ executable docs
   default-language: Haskell2010
   hs-source-dirs:   .,
                     shortcut
-  build-depends:    ShortCut,
+  build-depends:    OrthoLang,
                     Glob,
                     MissingH,
                     ansi-terminal,

Docs.hs

@@ -7,15 +7,15 @@ module Main where
  - TODO put in a separate binary?
  -}
 
-import ShortCut.Core.Types
+import OrthoLang.Core.Types
 
 import Data.List.Split  (splitOn)
 import Data.List.Utils  (join)
-import ShortCut.Modules (modules)
+import OrthoLang.Modules (modules)
 import Data.Char        (toLower, isAlphaNum)
 import Data.List (nub)
 import System.FilePath ((</>), (<.>))
-import Paths_ShortCut             (getDataFileName)
+import Paths_OrthoLang             (getDataFileName)
 import Control.Monad (when)
 import System.Directory (doesFileExist)
 

README.md

@@ -1,7 +1,7 @@
 shortcut-demo
 =============
 
-An interactive web demo + tutorial for [ShortCut][1].
+An interactive web demo + tutorial for [OrthoLang][1].
 Try the live version at [shortcut.pmb.berkeley.edu](https://shortcut.pmb.berkeley.edu)!
 
 Install as a NixOS service

ortholang

@@ -502,7 +502,7 @@ Functions:
 
 Random (but reproducable) sampling of list elements.
 
-WARNING: Because of the way ShortCut caches tempfiles, calling these
+WARNING: Because of the way OrthoLang caches tempfiles, calling these
 more than once will give the same sublist each time! For different
 sublists, use in combination with the 'repeat' function.
 

reference.md

@@ -19,7 +19,7 @@ in {
         default = false;
         type = with types; bool;
         description = ''
-          Enable the ShortCut demo server
+          Enable the OrthoLang demo server
         '';
       };
 
@@ -104,7 +104,7 @@ in {
     systemd.services."shortcut-demo" = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      description = "ShortCut demo server";
+      description = "OrthoLang demo server";
       serviceConfig = {
         Type = "simple";
         User = "${cfg.user}";

service.nix

@@ -8,7 +8,7 @@
 # TODO should users dir be optional?
 
 '''
-Launch the ShortCut demo server.
+Launch the OrthoLang demo server.
 
 Usage:
   shortcut-demo (-h | --help)
@@ -316,8 +316,8 @@ def index(user='guest'):
                            codeblock_userpaths=blocks.keys())
 
 # Flask doesn't like sending random files from all over for security reasons,
-# so we make these simplified routes where /TMPDIR and /WORKDIR refer to their ShortCut equivalents.
-# Lines from ShortCut get rewritten with regexes to include that (messy I know),
+# so we make these simplified routes where /TMPDIR and /WORKDIR refer to their OrthoLang equivalents.
+# Lines from OrthoLang get rewritten with regexes to include that (messy I know),
 # and then this function finds the real paths again when we need to fetch a file.
 @FLASK.route('/TMPDIR/<path:filename>')
 def send_tmpfile(filename):
@@ -399,13 +399,13 @@ def handle_connect():
         if not uname:
             LOGGER.info('client %s started a guest session' % sid)
             # print 'trying to start thread...'
-            SESSIONS[sid] = ShortCutThread(sid, 'guest')
+            SESSIONS[sid] = OrthoLangThread(sid, 'guest')
             # print 'success!'
             thread = SESSIONS[sid]
         else:
             if not uname in SESSIONS:
                 LOGGER.info('%s started a new session with id %s' % (uname, sid))
-                SESSIONS[uname] = ShortCutThread(sid, uname)
+                SESSIONS[uname] = OrthoLangThread(sid, uname)
             else:
                 LOGGER.info('user %s resuming with new session id %s' % (uname, sid))
                 SESSIONS[uname].sessionids.add(sid)
@@ -512,7 +512,7 @@ def handle_reqresult():
 
 def check_shortcut_version():
     LOGGER.info('checking output of "shortcut --version"')
-    version_expected = u'ShortCut 0.9.2'
+    version_expected = u'OrthoLang 0.9.2'
     proc = spawn('shortcut', ['--version'], encoding='utf-8', timeout=None)
     try:
         proc.expect(version_expected, timeout=10)
@@ -524,9 +524,9 @@ def check_shortcut_version():
 
 check_shortcut_version()
 
-class ShortCutThread(Thread):
+class OrthoLangThread(Thread):
     def __init__(self, sessionid, username):
-        LOGGER.debug('init ShortCutThread')
+        LOGGER.debug('init OrthoLangThread')
         LOGGER.info('creating session %s' % sessionid)
         # self.delay = 0.01
         self.sessionids = set([sessionid])
@@ -547,7 +547,7 @@ def __init__(self, sessionid, username):
             pass # already exists
         self._done = Event()
         self.process = None
-        super(ShortCutThread, self).__init__()
+        super(OrthoLangThread, self).__init__()
 
     def run(self):
         options = [ARROW, u'Bye for now!'] # , '.*']

shortcut

@@ -21,4 +21,4 @@ extra-deps:
 # TODO are the rtsopts a problem? see if removing fixes any fails
 ghc-options:
         # "all": -O2
-        # "ShortCut": -O0
+        # "OrthoLang": -O0