fixes missing string tests and expression/transformation
This commit is contained in:
@ -16,7 +16,6 @@ module Parser
|
||||
rule(:dot) { str('.') }
|
||||
rule(:digit) { match('[0-9]') }
|
||||
rule(:exponent) { (str('e')| str('E')) }
|
||||
rule(:escaped_character) { str('\\') >> (match('["\\\\/bfnrt]') | (str('u') >> hexdigit.repeat(4,4))) }
|
||||
|
||||
rule(:true) { str('true').as(:true) >> space?}
|
||||
rule(:false) { str('false').as(:false) >> space?}
|
||||
@ -28,7 +27,7 @@ module Parser
|
||||
#anything in double quotes
|
||||
rule(:string){
|
||||
double_quote >>
|
||||
(escaped_character | double_quote.absent? >> any ).repeat.as(:string) >>
|
||||
( double_quote.absent? >> any ).repeat.as(:string) >>
|
||||
double_quote >> space?
|
||||
}
|
||||
rule(:integer) { sign.maybe >> digit.repeat(1).as(:integer) >> space? }
|
||||
|
@ -27,7 +27,7 @@ module Parser
|
||||
|
||||
rule(:assignment) { name.as(:asignee) >> equal_sign >> expression.as(:asigned) }
|
||||
|
||||
rule(:expression) { conditional | function_call | integer | (name >> space? >> equal_sign.absent?) }
|
||||
rule(:expression) { conditional | function_call | integer | string | (name >> space? >> equal_sign.absent?) }
|
||||
|
||||
def delimited_expressions( delimit )
|
||||
( space? >> (delimit.absent? >> (assignment | expression)).repeat(1)).as(:expressions) >> delimit
|
||||
|
@ -35,6 +35,16 @@ module Parser
|
||||
end
|
||||
end
|
||||
|
||||
class StringExpression < Expression
|
||||
attr_reader :string
|
||||
def initialize str
|
||||
@string = str
|
||||
end
|
||||
def == other
|
||||
compare other , [:string]
|
||||
end
|
||||
end
|
||||
|
||||
class FuncallExpression < Expression
|
||||
attr_reader :name, :args
|
||||
def initialize name, args
|
||||
|
@ -5,6 +5,7 @@ module Parser
|
||||
class Transform < Parslet::Transform
|
||||
rule(:integer => simple(:value)) { IntegerExpression.new(value.to_i) }
|
||||
rule(:name => simple(:name)) { NameExpression.new(name.to_s) }
|
||||
rule(:string => simple(:string)) { StringExpression.new(string.to_s) }
|
||||
|
||||
rule(:argument => simple(:argument)) { argument }
|
||||
rule(:argument_list => sequence(:argument_list)) { argument_list }
|
||||
|
Reference in New Issue
Block a user