brb

generate_args.exs

@@ -6,7 +6,7 @@ defmodule Farmbot.CeleryScript.AST.Arg.<%= arg %> do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end
 """
 
@@ -28,7 +28,6 @@ end
 for node <- nodes do
   camel_node = Macro.camelize(node["name"])
   allowed_args = Map.get(node, "allowed_args") |> Enum.map(fn(arg_str) -> ":#{arg_str}" end) |> Enum.join(", ")
-  IO.puts "#{node["name"]} => #{allowed_args}"
   str = EEx.eval_string(node_template, [allowed_args: allowed_args, node: camel_node])
   File.write!("lib/farmbot/celery_script/ast/node/#{node["name"]}.ex", str)
   # |> Code.eval_string()

lib/farmbot/celery_script/ast/arg/_else.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Else do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/_then.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Then do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/axis.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Axis do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/channel_name.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.ChannelName do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/is_outdated.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.IsOutdated do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/label.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Label do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/lhs.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Lhs do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/location.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Location do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/message.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Message do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/message_type.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.MessageType do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/milliseconds.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Milliseconds do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/offset.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Offset do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/op.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Op do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/package.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Package do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/pin_mode.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.PinMode do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/pin_number.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.PinNumber do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/pin_value.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.PinValue do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/pointer_id.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.PointerId do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/pointer_type.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.PointerType do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/radius.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Radius do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/rhs.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Rhs do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/sequence_id.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.SequenceId do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/speed.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Speed do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/tool_id.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.ToolId do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/url.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Url do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/value.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Value do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/version.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Version do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/x.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.X do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/y.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Y do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/arg/z.ex

@@ -2,5 +2,5 @@ defmodule Farmbot.CeleryScript.AST.Arg.Z do
   @moduledoc false
   @behaviour Farmbot.CeleryScript.AST.Arg
 
-  def verify(_), do: :ok
+  def verify(val), do: {:ok, val}
 end

lib/farmbot/celery_script/ast/ast.ex

@@ -8,7 +8,7 @@ defmodule Farmbot.CeleryScript.AST do
     @moduledoc "CeleryScript Argument."
 
     @doc "Verify this arg."
-    @callback verify(any) :: :ok | {:error, term}
+    @callback verify(any) :: {:ok, any} | {:error, term}
   end
 
   defmodule Node do
@@ -43,7 +43,7 @@ defmodule Farmbot.CeleryScript.AST do
           if {arg_name, 0} in __MODULE__.module_info(:exports) do
             case apply(__MODULE__, arg_name, []).verify(val) do
               # if this argument is valid, continue enumeration.
-              :ok -> decode_args(rest, [arg | acc])
+              {:ok, decoded} -> decode_args(rest, [decoded | acc])
               {:error, _} = err -> err
             end
           else

lib/farmbot/celery_script/ast/node/sequence.ex

@@ -1,5 +1,5 @@
 defmodule Farmbot.CeleryScript.AST.Node.Sequence do
   @moduledoc false
   use Farmbot.CeleryScript.AST.Node
-  allow_args [:version, :is_outdated]
+  allow_args [:version]
 end