This repository has been archived by the owner on Jan 5, 2019. It is now read-only.
forked from emicklei/proto
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
proper parsing extensions, refactored parsing reserved
Change-Id: Ia7ff015d8fb87ccebd02152a45533c5352509f04
- Loading branch information
Showing
9 changed files
with
241 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // Copyright (c) 2017 Ernest Micklei | ||
| // | ||
| // MIT License | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
| package proto | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strconv" | ||
| ) | ||
|
|
||
| // Range is to specify number intervals (with special end value "max") | ||
| type Range struct { | ||
| From, To int | ||
| Max bool | ||
| } | ||
|
|
||
| // String return a single number if from = to. Returns <from> to <to> otherwise unless Max then return <from> to max. | ||
| func (r Range) String() string { | ||
| if r.Max { | ||
| return fmt.Sprintf("%d to max", r.From) | ||
| } | ||
| if r.From == r.To { | ||
| return strconv.Itoa(r.From) | ||
| } | ||
| return fmt.Sprintf("%d to %d", r.From, r.To) | ||
| } | ||
|
|
||
| // parseRanges is used to parse ranges for extensions and reserved | ||
| func parseRanges(p *Parser, n Visitee) (list []Range, err error) { | ||
| seenTo := false | ||
| for { | ||
| lit, isString := p.s.scanLiteral() | ||
| if isString { | ||
| return list, p.unexpected(lit, "integer, <to> <max>", n) | ||
| } | ||
| switch lit { | ||
| case ",": | ||
| case "to": | ||
| seenTo = true | ||
| case ";": | ||
| p.s.unread(';') // allow for inline comment parsing | ||
| goto done | ||
| case "max": | ||
| if !seenTo { | ||
| return list, p.unexpected(lit, "to", n) | ||
| } | ||
| from := list[len(list)-1] | ||
| list = append(list[0:len(list)-1], Range{From: from.From, Max: true}) | ||
| default: | ||
| // must be number | ||
| i, err := strconv.Atoi(lit) | ||
| if err != nil { | ||
| return list, p.unexpected(lit, "range integer", n) | ||
| } | ||
| if seenTo { | ||
| // replace last two ranges with one | ||
| if len(list) < 1 { | ||
| p.unexpected(lit, "integer", n) | ||
| } | ||
| from := list[len(list)-1] | ||
| list = append(list[0:len(list)-1], Range{From: from.From, To: i}) | ||
| seenTo = false | ||
| } else { | ||
| list = append(list, Range{From: i, To: i}) | ||
| } | ||
| } | ||
| } | ||
| done: | ||
| return | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright (c) 2017 Ernest Micklei | ||
| // | ||
| // MIT License | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
| package proto | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestParseRanges(t *testing.T) { | ||
| r := new(Reserved) | ||
| p := newParserOn(`reserved 2, 15, 9 to 11;`) | ||
| _, _ = p.scanIgnoreWhitespace() | ||
| ranges, err := parseRanges(p, r) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if got, want := ranges[2].String(), "9 to 11"; got != want { | ||
| t.Errorf("got [%v] want [%v]", got, want) | ||
| } | ||
| } | ||
|
|
||
| func TestParseRangesMax(t *testing.T) { | ||
| r := new(Extensions) | ||
| p := newParserOn(`extensions 3 to max;`) | ||
| _, _ = p.scanIgnoreWhitespace() | ||
| ranges, err := parseRanges(p, r) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if got, want := ranges[0].String(), "3 to max"; got != want { | ||
| t.Errorf("got [%v] want [%v]", got, want) | ||
| } | ||
| } | ||
|
|
||
| func TestParseRangesMultiToMax(t *testing.T) { | ||
| r := new(Extensions) | ||
| p := newParserOn(`extensions 1,2 to 5,6 to 9,10 to max;`) | ||
| _, _ = p.scanIgnoreWhitespace() | ||
| ranges, err := parseRanges(p, r) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if got, want := len(ranges), 4; got != want { | ||
| t.Fatalf("got [%v] want [%v]", got, want) | ||
| } | ||
| if got, want := ranges[3].String(), "10 to max"; got != want { | ||
| t.Errorf("got [%v] want [%v]", got, want) | ||
| } | ||
| } |
Oops, something went wrong.