guillaume
/
biju
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add request before response in parser

develop
Guillaume DOTT 2013-09-06 17:29:43 +02:00
parent 955654365a
commit c0a3fe8ef0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/biju/parser.rb
View File

@ -8,11 +8,11 @@ module Biju
rule(:at_string) { request | response } rule(:at_string) { request | response }
# REQUEST # REQUEST
rule(:request) { str('+++') | str('A/') | (prefix >> (crlf.absent? >> any).repeat) } rule(:request) { str('+++') | str('A/') | (prefix >> (cr.absent? >> lf.absent? >> any).repeat(0)) >> response.maybe }
rule(:prefix) { str('AT') | str('at') } rule(:prefix) { str('AT') | str('at') }
# RESPONSE # RESPONSE
rule(:response) { (status | command) >> crlf } rule(:response) { cr >> crlf >> (status | command) >> crlf }
rule(:command) { mgl | pms | mserror } rule(:command) { mgl | pms | mserror }
rule(:mserror) { str('+CMS ERROR').as(:cmd) >> str(': ') >> message } rule(:mserror) { str('+CMS ERROR').as(:cmd) >> str(': ') >> message }
@ -21,7 +21,8 @@ module Biju
crlf >> status crlf >> status
end end
rule(:pms) do rule(:pms) do
str('+CPMS').as(:cmd) >> str(': ') >> str('(').maybe >> array >> str(')').maybe str('+CPMS').as(:cmd) >> str(': ') >> str('(').maybe >> array >> str(')').maybe >>
crlf >> crlf >> status
end end
rule(:array) do rule(:array) do