Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix message passing operator #3

Merged
merged 1 commit into from Dec 6, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 24 additions & 24 deletions lib/oop.ex
Expand Up @@ -151,11 +151,11 @@ defmodule OOP do

defmacro @({ attr, _, nil }) do
quote do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]

{_, pid} = self
pid <- { Kernel.self, unquote(attr) }
send pid, { Kernel.self, unquote(attr) }
rpid = pid.to_pid
receive do
{ ^rpid, value } -> value
Expand All @@ -165,11 +165,11 @@ defmodule OOP do

defmacro @({ attr, _, [code] }) do
quote do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]

{_, pid} = self
pid <- { Kernel.self, { unquote(attr), unquote(code) } }
send pid, { Kernel.self, { unquote(attr), unquote(code) } }
rpid = pid.to_pid
receive do
{ ^rpid, val } -> val
Expand All @@ -183,8 +183,8 @@ defmodule OOP do

Kernel.def new(unquote_splicing(params))
when unquote_splicing(guards) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
self = { __MODULE__, OOP.new_server }
unquote transform block
Expand All @@ -197,8 +197,8 @@ defmodule OOP do
quote do
Kernel.def unquote(name)(unquote_splicing(params), { __MODULE__, { Process.Managed, _, _ } } = self)
when unquote_splicing(guards) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand All @@ -210,8 +210,8 @@ defmodule OOP do
@make_init false

Kernel.def new(unquote_splicing(params)) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
self = { __MODULE__, OOP.new_server }
unquote transform block
Expand All @@ -223,8 +223,8 @@ defmodule OOP do
Kernel.defp defmethod!(name, params, block) do
quote do
Kernel.def unquote(name)(unquote_splicing(params), { __MODULE__, { Process.Managed, _, _ } } = self) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand All @@ -236,8 +236,8 @@ defmodule OOP do
@make_init false

Kernel.def new() do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
self = { __MODULE__, OOP.new_server }
unquote transform block
Expand All @@ -249,8 +249,8 @@ defmodule OOP do
Kernel.defp defmethod!(name, block) do
quote do
Kernel.def unquote(name)({ __MODULE__, { Process.Managed, _, _ } } = self) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand All @@ -261,8 +261,8 @@ defmodule OOP do
quote do
Kernel.defp unquote(name)(unquote_splicing(params), { __MODULE__, { Process.Managed, _, _ } } = self)
when (unquote_splicing(guards)) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand All @@ -272,8 +272,8 @@ defmodule OOP do
Kernel.defp defmethodp!(name, params, block) do
quote do
Kernel.defp unquote(name)(unquote_splicing(params), { __MODULE__, { Process.Managed, _, _ } } = self) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand All @@ -283,8 +283,8 @@ defmodule OOP do
Kernel.defp defmethodp!(name, block) do
quote do
Kernel.defp unquote(name)({ __MODULE__, { Process.Managed, _, _ } } = self) do
import Kernel, except: [@: 1, <-: 2]
import Process.Managed, only: [<-: 2]
import Kernel, except: [@: 1, send: 2]
import Process.Managed, only: [send: 2]
import OOP, only: [@: 1]
unquote transform block
end
Expand Down