400b58c0e9
The original string interpolation was based on hil which didn't allow proper escaping, since they used a different escape pattern. Secondly, the golang Unquote function didn't deal with the variable substitution, which meant it had to be performed in a second step. Most importantly, because we did this partial job in Unquote (the fact that is strips the leading and trailing quotes tricked me into thinking I was done with interpolation!) it was impossible to remedy the remaining parts in a second pass with hil. Both operations needs to be done in a single step. This is logical when you aren't tunnel visioned. This patch replaces both of these so that string interpolation works properly. This removes the ability to allow inline function calls in a string, however this was an incidental feature, and it's not clear that having it is a good idea. It also requires you wrap the var name with curly braces. (They are not optional.) This comes with a load of tests, but I think I got some of it wrong, since I'm quite new at ragel. If you find something, please say so =D In any case, this is much better than the original hil implementation, and easy for a new contributor to patch to make the necessary fixes.
47 lines
1.6 KiB
Go
47 lines
1.6 KiB
Go
// Mgmt
|
|
// Copyright (C) 2013-2021+ James Shubin and the project contributors
|
|
// Written by James Shubin <james@shubin.ca> and the project contributors
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package interpolate
|
|
|
|
// Stream is the list of tokens that are produced after interpolating a string.
|
|
// It is created by using the generated Parse function.
|
|
// TODO: In theory a more advanced parser could produce an AST here instead.
|
|
type Stream []Token
|
|
|
|
// Token is the interface that every token must implement.
|
|
type Token interface {
|
|
token()
|
|
}
|
|
|
|
// Literal is a string literal that we have found after interpolation parsing.
|
|
type Literal struct {
|
|
Value string
|
|
}
|
|
|
|
// token ties the Literal to the Token interface.
|
|
func (Literal) token() {}
|
|
|
|
// Variable is a variable name that we have found after interpolation parsing.
|
|
type Variable struct {
|
|
Name string
|
|
}
|
|
|
|
// token ties the Variable to the Token interface.
|
|
func (Variable) token() {}
|
|
|
|
// TODO: do we want to allow inline-function calls in a string?
|