forked from joejulian/gio
layout: parse empty names and let higher levels generate errors
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
+4
-5
@@ -409,20 +409,19 @@ func parseValue(f *formatter) unit.Value {
|
|||||||
|
|
||||||
func parseName(f *formatter) string {
|
func parseName(f *formatter) string {
|
||||||
i := 0
|
i := 0
|
||||||
|
loop:
|
||||||
for ; i < len(f.expr); i++ {
|
for ; i < len(f.expr); i++ {
|
||||||
c := f.expr[i]
|
c := f.expr[i]
|
||||||
switch {
|
switch {
|
||||||
case c == '(' || c == ',' || c == ')':
|
case c == '(' || c == ',' || c == ')':
|
||||||
fname := f.expr[:i]
|
break loop
|
||||||
f.expr = f.expr[i:]
|
|
||||||
return fname
|
|
||||||
case c < 'a' || 'z' < c:
|
case c < 'a' || 'z' < c:
|
||||||
errorf("invalid character '%c' in layout name", c)
|
errorf("invalid character '%c' in layout name", c)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
fname := f.expr[:i]
|
||||||
f.expr = f.expr[i:]
|
f.expr = f.expr[i:]
|
||||||
errorf("missing ( after layout function")
|
return fname
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseFloat(f *formatter) float32 {
|
func parseFloat(f *formatter) float32 {
|
||||||
|
|||||||
Reference in New Issue
Block a user