Integrate the OPI

Comment.tmPreferences

@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>name</key>
-	<string>Comment</string>
-	<key>scope</key>
-	<string>source.oz</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string>%</string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>7c251375-db32-45e7-b216-0fc70b53a6f5</string>
+   <key>name</key>
+   <string>Oz comments</string>
+   <key>scope</key>
+   <string>source.oz</string>
+   <key>settings</key>
+   <dict>
+      <key>shellVariables</key>
+      <array>
+         <dict>
+            <key>name</key>
+            <string>TM_COMMENT_START</string>
+            <key>value</key>
+            <string>%</string>
+         </dict>
+         <dict>
+            <key>name</key>
+            <string>TM_COMMENT_START_2</string>
+            <key>value</key>
+            <string>/*</string>
+         </dict>
+         <dict>
+            <key>name</key>
+            <string>TM_COMMENT_END_2</string>
+            <key>value</key>
+            <string>*/</string>
+         </dict>
+      </array>
+   </dict>
 </dict>
 </plist>

Context.sublime-menu

@@ -0,0 +1,8 @@
+[
+    { "caption": "-", "id": "Oz feed" },
+    {
+        "caption": "Oz: Feed to Compiler",
+        "command": "oz_feed_context",
+        "mnemonic": "F"
+    }
+]

Default.sublime-commands

@@ -0,0 +1,6 @@
+[
+	{
+		"caption": "Oz: Halt compiler",
+		"command": "oz_kill"
+	}
+]

Default.sublime-keymap

@@ -0,0 +1,8 @@
+[
+	{ "keys": ["ctrl+keypad_period", "ctrl+l"], "command": "oz_feed_line"},
+	{ "keys": ["ctrl+keypad_period", "ctrl+r"], "command": "oz_feed_region"},
+	{ "keys": ["ctrl+keypad_period", "ctrl+s"], "command": "oz_feed_region"},
+	{ "keys": ["ctrl+keypad_period", "ctrl+b"], "command": "oz_feed_buffer"},
+	{ "keys": ["ctrl+keypad_period", "ctrl+f"], "command": "oz_feed_buffer"},
+	{ "keys": ["ctrl+keypad_period", "h"], "command": "oz_kill"}
+]

LICENSE.txt

@@ -1,6 +1,9 @@
 The MIT License (MIT)
 
 Copyright (c) 2017 Robert Koeninger
+Copyright (c) 2018 Andres Zarza Davila
+
+Also, concerning socket_pipe.py : Copyright (c) 2016 Ramsey Nasser 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Main.sublime-menu

@@ -0,0 +1,30 @@
+[
+    {
+        "caption": "Oz",
+        "mnemonic": "O",
+        "id": "oz-menu",
+        "children":
+        [
+            {
+                "caption": "Halt Oz",
+                "command": "oz_kill"
+            },
+            { "caption": "-", "id": "feed" },
+            {
+                "caption": "Feed Line",
+                "command": "oz_feed_line",
+                "mnemonic": "L"
+            },
+            {
+                "caption": "Feed Selection",
+                "command": "oz_feed_region",
+                "mnemonic": "S"
+            },
+            {
+                "caption": "Feed File",
+                "command": "oz_feed_buffer",
+                "mnemonic": "F"
+            },
+        ]
+    }
+]

README.md

@@ -1,28 +1,50 @@
 # Sublime/Oz
 
 [Oz language](http://mozart.github.io/) support for [Sublime Text 3](https://www.sublimetext.com/).
+This plugin intends to be an alternative to the classic Emacs Oz interface.
+It is however still in work. Particularly killing subprocesses is still not
+correctly implemented and not automatic.
+
+## Usage
+
+To evaluate some code, you need to feed it to the Oz compiler.
+This can be done from the "Oz" menu, from the context menu or with the following shortcuts.
+
+ * Feed Line : **Ctrl-. + Ctrl-l**
+ * Feed Region (selected text): **Ctrl-. + Ctrl-r**
+ * Feed Buffer (the whole file): **Ctrl-. + Ctrl-b**
+
+It may be useful to kill the running compiler. This is also available in the "Oz" menu, or with a shortcut.
+The compiler will be restarted automatically on the next feed command.
+
+ * Kill oz : **Ctrl-. + h**
+
 
 ## Features
 
+  * OPI Integration - Submit current line/selection/file to the Oz compiler (as with the Emacs OPI).
   * Syntax Highlighting - detects files matching the pattern `*.oz`.
-  * Comments - Applies Oz-style single line (%) comments using standard commands/shortcuts.
+  * Comments - Comment/Uncomment Oz code using standard commands/shortcuts.
 
 ## Automatic Installation
 
 Sublime/Oz is available from [Package Control](https://packagecontrol.io/packages/Oz) under the name `Oz`.
+This package contains only the syntax Highlighting and Comments. If you wish to
+use the build/run features you need to install the plugin manualy.
 
 ## Manual Installation
 
-Download this repo as an archive or `git clone` it under the `Packages` directory under your Sublime user path.
+Download this repo as an archive or `git clone` it under the `Packages\User` directory under your Sublime user path.
 
 On Windows, this is something like `C:\Users\%USER_NAME%\AppData\Roaming\Sublime Text 3\Packages`.
 
+On linux, this is something like `/home/user/.config/sublime-text-3`
+
 Once the `sublime-oz` package is in place, just restart Sublime, and it should be ready to go.
 
 ## Future Work
 
   * Snippets
-  * Build/Run
   * Formatting
 
 ## Contributing

oz_compile.py

@@ -0,0 +1,43 @@
+import subprocess
+from subprocess import PIPE, Popen
+import sublime
+import sublime_plugin
+
+def compile_mozart(file):
+    process = Popen(['ozc', '-c', file], stdout=PIPE, stderr=PIPE)
+    stdout, stderr = process.communicate()
+    process.wait()
+    return_code = process.poll()
+    outs = stdout.decode('utf-8')
+    errs = stderr.decode('utf-8')
+    return [outs, errs, return_code]
+
+def execute_mozart(file):
+    process = Popen(['ozengine', file], stdout=PIPE, stderr=PIPE)
+    stdout, stderr = process.communicate()
+    process.wait()
+    outs = stdout.decode('utf-8')
+    errs = stderr.decode('utf-8')
+    return [outs, errs]
+
+class OzCompileCommand(sublime_plugin.TextCommand):
+    def run(self, edit):
+        file = self.view.file_name()
+        co = compile_mozart(file)
+        [out_comp, err_comp, code_comp] = compile_mozart(file)
+        window = sublime.active_window()
+        panel = window.find_output_panel('oz_panel')
+        if(panel == None):
+            panel = window.create_output_panel('oz_panel')
+        window.run_command('show_panel', {'panel':'output.oz_panel'})
+        panel.set_read_only(False)
+        panel.run_command("append", {"characters": "Compilation output :\n"})
+        panel.run_command("append", {"characters": out_comp+"\n"+err_comp+"\n"})
+        if(code_comp == 0):
+            [out_exec, err_exec] = execute_mozart(file+'f')
+            panel.run_command("append", {"characters": "Execution output:\n"})
+            panel.run_command("append", {"characters": out_exec+"\n"+err_exec+"\n"})
+        panel.set_read_only(True)
+    def is_visible(self):
+        print(self.view.window().active_panel())
+        return True

oz_plugin.py

@@ -0,0 +1,118 @@
+import subprocess
+from subprocess import PIPE, Popen
+import sublime
+import sublime_plugin
+import threading
+from .socket_pipe import OzThread
+
+sp = None
+
+def with_oz(f):
+    def wrapper(*args, **kwargs):
+        global sp
+        if not sp:
+            start_oz()
+        f(*args, **kwargs)
+    return wrapper
+
+def start_oz():
+    global sp
+    sp = OzThread()
+    sp.start()
+
+class OzRunCommand(sublime_plugin.TextCommand):
+    @with_oz
+    def run(self, edit):
+        pass
+
+@with_oz
+def feed_region(view):
+    global sp
+    msg = ""
+    for region in view.sel():
+        if not region.empty():
+            msg += view.substr(region)
+    sp.send(msg)
+
+class OzFeedRegion(sublime_plugin.TextCommand):
+    def run(self, edit):
+        feed_region(self.view)
+
+    def is_enabled(self):
+        for region in self.view.sel():
+            if not region.empty():
+                return True
+        return False
+
+    def description(self):
+        "Feed the selected text to the Oz compiler"
+
+
+@with_oz
+def feed_line(view):
+    global sp
+    msg = ""
+    for region in view.sel():
+        if region.empty:
+            line = view.line(region)
+            msg += view.substr(line) + '\n'
+    sp.send(msg)
+
+class OzFeedLine(sublime_plugin.TextCommand):
+    def run(self, edit):
+        feed_line(self.view)
+
+    def is_enabled(self):
+        for region in self.view.sel():
+            if region.empty():
+                return True
+        return False
+
+    def description(self):
+        "Feed the current line to the Oz compiler"
+
+class OzFeedBuffer(sublime_plugin.TextCommand):
+    @with_oz
+    def run(self, edit):
+        global sp
+        msg = self.view.substr(sublime.Region(0, self.view.size()))
+        sp.send(msg)
+
+    def description(self):
+        "Feed the current file to the Oz compiler"
+
+class OzFeedContext(sublime_plugin.TextCommand):
+    def run(self, edit):
+        global sp
+        msg = ""
+        for region in self.view.sel():
+            if not region.empty:
+                return feed_region(self.view)
+        return feed_line(self.view)
+
+    def is_enabled(self):
+        for region in self.view.sel():
+            return True
+        return False
+
+    def description(self):
+        "Feed text to the Oz compiler"
+
+
+def stop():
+    global sp
+    if sp:
+        sp.stop()
+    sp = None
+
+class OzKillCommand(sublime_plugin.TextCommand):
+    def run(self, edit):
+        stop()
+
+    def description(self):
+        "Kill the Oz compiler"
+
+class ExitListener(sublime_plugin.EventListener):
+    def on_pre_close(view):
+        stop()
+