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.
34 lines
801 B
Bash
Executable File
34 lines
801 B
Bash
Executable File
#!/bin/bash
|
|
# check that headers are properly formatted
|
|
|
|
echo running "$0"
|
|
|
|
#ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" # dir!
|
|
ROOT=$(dirname "${BASH_SOURCE}")/..
|
|
cd "${ROOT}"
|
|
. test/util.sh
|
|
|
|
FILE="main.go" # file headers should match main.go
|
|
COUNT=0
|
|
while IFS='' read -r line; do # find what header should look like
|
|
echo "$line" | grep -q '^//' || break
|
|
COUNT=`expr $COUNT + 1`
|
|
done < "$FILE"
|
|
|
|
find_files() {
|
|
git ls-files | grep -E '\.go$|\.rl$' | grep -v '^examples/' | grep -v '^test/'
|
|
}
|
|
|
|
bad_files=$(
|
|
for i in $(find_files); do
|
|
if ! diff -q <( head -n $COUNT "$i" ) <( head -n $COUNT "$FILE" ) &>/dev/null; then
|
|
echo "$i"
|
|
fi
|
|
done
|
|
)
|
|
|
|
if [[ -n "${bad_files}" ]]; then
|
|
fail_test "The following file headers are not properly formatted: ${bad_files}"
|
|
fi
|
|
echo 'PASS'
|