aboutsummaryrefslogtreecommitdiffstats
path: root/src/rcl_goal.peg
diff options
context:
space:
mode:
authorEric <[email protected]>2012-10-23 09:49:06 -0500
committerJordan Wilberding <[email protected]>2012-10-24 11:30:00 -0600
commitd880e6e385ac49ecfe67449a25c1fd95b4e1f882 (patch)
tree475033c35342f91e926cbed7dbd3354e0d71b722 /src/rcl_goal.peg
parentfa52e19b4990a17eb7efbafc0364c0c686d7b770 (diff)
downloadrelx-d880e6e385ac49ecfe67449a25c1fd95b4e1f882.tar.gz
relx-d880e6e385ac49ecfe67449a25c1fd95b4e1f882.tar.bz2
relx-d880e6e385ac49ecfe67449a25c1fd95b4e1f882.zip
fix bug in goal parsing and handling
Signed-off-by: Jordan Wilberding <[email protected]>
Diffstat (limited to 'src/rcl_goal.peg')
-rw-r--r--src/rcl_goal.peg9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rcl_goal.peg b/src/rcl_goal.peg
index 24e78a8..bfac607 100644
--- a/src/rcl_goal.peg
+++ b/src/rcl_goal.peg
@@ -6,15 +6,15 @@ constraint <- ws? app_name ws? between_op ws? version ws? "," ws? version ws?
`
case Node of
[_,AppName,_, _] ->
- {ok, erlang:iolist_to_binary(AppName)};
+ {ok, AppName};
[_,AppName,_,Op,_,Vsn,_, _] ->
{ok,
- {erlang:iolist_to_binary(AppName),
+ {AppName,
rcl_goal_utils:to_vsn(Vsn),
rcl_goal_utils:to_op(Op)}};
[_,AppName,_,Op,_,Vsn1,_,_,_,Vsn2,_,_] ->
{ok,
- {erlang:iolist_to_binary(AppName),
+ {AppName,
rcl_goal_utils:to_vsn(Vsn1),
rcl_goal_utils:to_vsn(Vsn2),
rcl_goal_utils:to_op(Op)}};
@@ -25,7 +25,8 @@ constraint <- ws? app_name ws? between_op ws? version ws? "," ws? version ws?
ws <- [ \t\n\s\r] ;
-app_name <- [a-zA-Z0-9_]+ ;
+app_name <- [a-zA-Z0-9_]+
+ ` erlang:list_to_atom(erlang:binary_to_list(erlang:iolist_to_binary(Node))) ` ;
between_op <-
":" ws? ( "btwn" / "between" ) ws? ":"