Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.

Commit

Permalink
parser.go: better code organization about Parse().
Browse files Browse the repository at this point in the history
use switch to separate each parse process.
  • Loading branch information
suzuken committed Feb 14, 2016
1 parent 9334f08 commit 5365e8e
Showing 1 changed file with 12 additions and 16 deletions.
28 changes: 12 additions & 16 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ func (p *Parser) Parse() (exps types.Expression, err error) {
if err != nil {
return nil, err
}
if token == "'" {

switch token {
case "'":
// if start with (, deal as list.
// recursive scan until ")"
// if start with "'(", it's list.
Expand All @@ -69,31 +71,25 @@ func (p *Parser) Parse() (exps types.Expression, err error) {
return nil, err
}
return types.Symbol(t), nil
}

// start s-expression
if token == "(" {
case "(":
// start S-Expression. Parse as list.
return p.parseList()
} else if token == ")" {
case ")":
return nil, errors.New("unexpected ')'")
} else {
if token == "#t" {
return types.Boolean(true), nil
} else if token == "#f" {
return types.Boolean(false), nil
}

case "#t":
return types.Boolean(true), nil
case "#f":
return types.Boolean(false), nil
default:
// if token is string, get unquoted.
// It's get test from \"test\".
if p.lex.IsTokenString() {
return strconv.Unquote(p.lex.TokenText())
}

// try conversion to float. if failed, deal with symbol.
// try conversion to float. if failed, treated as symbol.
if n, err := strconv.ParseFloat(token, 64); err == nil {
return types.Number(n), nil
}

return types.Symbol(token), nil
}
}

0 comments on commit 5365e8e

Please sign in to comment.