qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 09:50:21 -07:00
Code Releases Activity

Added mechanism for very precise self-testing:

Browse Source 
- in selftest mode (-t) interpret comments of the form /* ERROR */ and /* SYNC */
  and validate reported errors with the error markings in a file
- added initial selftest.go file

Also:
- fixed an issue with empty blocks
- generally report better error messages
- added many more tests to the test script (essentially all .go programs which
  have no syntax errors)

R=r
OCL=17426
CL=17426
This commit is contained in:
Robert Griesemer 2008-10-18 16:42:25 -07:00
parent 265e73ee14
commit e45eb60657
5 changed files with 187 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
usr/gri/pretty/parser.go
View File

@ -9,8 +9,11 @@ import Node "node"
export type Parser struct {
verbose bool;
// Tracing/debugging
verbose, sixg bool;
indent uint;
// Scanner
scanner *Scanner.Scanner;
tokchan *<-chan *Scanner.Token;
comments *Node.List;
@ -76,23 +79,19 @@ func (P *Parser) Next0() {
func (P *Parser) Next() {
for P.Next0(); P.tok == Scanner.COMMENT; P.Next0() {
P.comments.Add(Node.NewComment(P.pos, P.val));
if P.val == "/*ERROR*/" {
// the position of the next token is the position of the next expected error
} else if P.val == "/*SYNC*/" {
// synchronized at the next token
}
}
}
func (P *Parser) Open(verbose bool, scanner *Scanner.Scanner, tokchan *<-chan *Scanner.Token) {
func (P *Parser) Open(verbose, sixg bool, scanner *Scanner.Scanner, tokchan *<-chan *Scanner.Token) {
P.verbose = verbose;
P.sixg = sixg;
P.indent = 0;
P.scanner = scanner;
P.tokchan = tokchan;
P.comments = Node.NewList();
P.Next();
P.expr_lev = 1;
P.scope_lev = 0;
@ -106,7 +105,12 @@ func (P *Parser) Error(pos int, msg string) {
func (P *Parser) Expect(tok int) {
if P.tok != tok {
P.Error(P.pos, "expected '" + Scanner.TokenString(tok) + "', found '" + Scanner.TokenString(P.tok) + "'");
msg := "expected '" + Scanner.TokenString(tok) + "', found '" + Scanner.TokenString(P.tok) + "'";
switch P.tok {
case Scanner.IDENT, Scanner.INT, Scanner.FLOAT, Scanner.STRING:
msg += " " + P.val;
}
P.Error(P.pos, msg);
}
P.Next(); // make progress in any case
}
@ -291,18 +295,41 @@ func (P *Parser) ParseChannelType() *Node.Type {
}
// TODO: The code below (ParseVarDecl, ParseVarDeclList) is all too
// complicated. There must be a better way to do this.
func (P *Parser) ParseVarDecl(expect_ident bool) *Node.Type {
t := Node.BadType;
if expect_ident {
x := P.ParseIdent();
t = Node.NewType(x.pos, Scanner.IDENT);
t.expr = x;
} else {
t = P.ParseType();
}
return t;
}
func (P *Parser) ParseVarDeclList(list *Node.List) {
P.Trace("VarDeclList");
// parse a list of types
i0 := list.len();
list.Add(P.ParseType());
list.Add(P.ParseVarDecl(i0 > 0));
for P.tok == Scanner.COMMA {
P.Next();
list.Add(P.ParseType());
list.Add(P.ParseVarDecl(i0 > 0));
}
typ := P.TryType();
var typ *Node.Type;
if i0 > 0 {
// not the first parameter section; we must have a type
typ = P.ParseType();
} else {
// first parameter section; we may have a type
typ = P.TryType();
}
// convert the list into a list of (type) expressions
if typ != nil {
@ -313,7 +340,7 @@ func (P *Parser) ParseVarDeclList(list *Node.List) {
if t.tok == Scanner.IDENT && t.expr.tok == Scanner.IDENT {
list.set(i, t.expr);
} else {
list.set(i, Node.NewLit(t.pos, Scanner.IDENT, "bad"));
list.set(i, Node.BadExpr);
P.Error(t.pos, "identifier expected");
}
}
@ -559,11 +586,8 @@ func (P *Parser) ParseStatementList() *Node.List {
func (P *Parser) ParseBlock() *Node.List {
P.Trace("Block");
var s *Node.List;
P.Expect(Scanner.LBRACE);
if P.tok != Scanner.RBRACE {
s = P.ParseStatementList();
}
s := P.ParseStatementList();
P.Expect(Scanner.RBRACE);
P.opt_semi = true;
@ -1001,11 +1025,9 @@ func (P *Parser) ParseIfStat() *Node.Stat {
s.block = P.ParseBlock();
if P.tok == Scanner.ELSE {
P.Next();
if P.tok == Scanner.IF {
s.post = P.ParseIfStat();
} else {
// For 6g compliance - should really be P.ParseBlock()
s1 := P.ParseStatement();
s1 := Node.BadStat;
if P.sixg {
s1 = P.ParseStatement();
if s1 != nil {
// not the empty statement
if s1.tok != Scanner.LBRACE {
@ -1017,7 +1039,13 @@ func (P *Parser) ParseIfStat() *Node.Stat {
}
s.post = s1;
}
} else if P.tok == Scanner.IF {
s1 = P.ParseIfStat();
} else {
s1 = Node.NewStat(P.pos, Scanner.LBRACE);
s1.block = P.ParseBlock();
}
s.post = s1;
}
P.Ecart();

9
usr/gri/pretty/pretty.go
View File

@ -14,7 +14,8 @@ import Printer "printer"
var (
silent = Flag.Bool("s", false, nil, "silent mode: no pretty print output");
verbose = Flag.Bool("v", false, nil, "verbose mode: trace parsing");
//sixg = Flag.Bool("6g", false, nil, "6g compatibility mode");
sixg = Flag.Bool("6g", true, nil, "6g compatibility mode");
testmode = Flag.Bool("t", false, nil, "test mode: interprets /* ERROR */ and /* SYNC */ comments");
tokenchan = Flag.Bool("token_chan", false, nil, "use token channel for scanner-parser connection");
)
@ -44,7 +45,7 @@ func main() {
}
scanner := new(Scanner.Scanner);
scanner.Open(src_file, src);
scanner.Open(src_file, src, testmode.BVal());
var tstream *<-chan *Scanner.Token;
if tokenchan.BVal() {
@ -52,7 +53,7 @@ func main() {
}
parser := new(Parser.Parser);
parser.Open(verbose.BVal(), scanner, tstream);
parser.Open(verbose.BVal(), sixg.BVal(), scanner, tstream);
prog := parser.ParseProgram();
@ -60,7 +61,7 @@ func main() {
sys.exit(1);
}
if !silent.BVal() {
if !silent.BVal() && !testmode.BVal() {
var P Printer.Printer;
(&P).Program(prog);
}

78
usr/gri/pretty/scanner.go
View File

@ -283,6 +283,10 @@ export type Scanner struct {
pos int; // current reading position
ch int; // one char look-ahead
chpos int; // position of ch
// testmode
testmode bool;
testpos int;
}
@ -419,21 +423,9 @@ func (S *Scanner) ErrorMsg(pos int, msg string) {
}
}
print(": ", msg, "\n");
}
func (S *Scanner) Error(pos int, msg string) {
const errdist = 10;
delta := pos - S.errpos; // may be negative!
if delta < 0 {
delta = -delta;
}
if delta > errdist || S.nerrors == 0 /* always report first error */ {
S.ErrorMsg(pos, msg);
S.nerrors++;
S.errpos = pos;
}
if S.nerrors >= 10 {
sys.exit(1);
@ -441,14 +433,48 @@ func (S *Scanner) Error(pos int, msg string) {
}
func (S *Scanner) Open(filename, src string) {
func (S *Scanner) Error(pos int, msg string) {
// check for expected errors (test mode)
if S.testpos < 0 || pos == S.testpos {
// test mode:
// S.testpos < 0: // follow-up errors are expected and ignored
// S.testpos == 0: // an error is expected at S.testpos and ignored
S.testpos = -1;
return;
}
// only report errors that are sufficiently far away from the previous error
// in the hope to avoid most follow-up errors
const errdist = 20;
delta := pos - S.errpos; // may be negative!
if delta < 0 {
delta = -delta;
}
if delta > errdist || S.nerrors == 0 /* always report first error */ {
S.ErrorMsg(pos, msg);
}
}
func (S *Scanner) ExpectNoErrors() {
// set the next expected error position to one after eof
// (the eof position is a legal error position!)
S.testpos = len(S.src) + 1;
}
func (S *Scanner) Open(filename, src string, testmode bool) {
S.filename = filename;
S.nerrors = 0;
S.errpos = 0;
S.src = src;
S.pos = 0;
S.Next();
S.testmode = testmode;
S.ExpectNoErrors(); // after setting S.src
S.Next(); // after S.ExpectNoErrrors()
}
@ -514,7 +540,29 @@ func (S *Scanner) ScanComment() string {
S.Error(pos, "comment not terminated");
exit:
return S.src[pos : S.chpos];
comment := S.src[pos : S.chpos];
if S.testmode {
// interpret ERROR and SYNC comments
oldpos := -1;
switch {
case len(comment) >= 8 && comment[3 : 8] == "ERROR" :
// an error is expected at the next token position
oldpos = S.testpos;
S.SkipWhitespace();
S.testpos = S.chpos;
case len(comment) >= 7 && comment[3 : 7] == "SYNC" :
// scanning/parsing synchronized again - no (follow-up) errors expected
oldpos = S.testpos;
S.ExpectNoErrors();
}
if 0 <= oldpos && oldpos <= len(S.src) {
// the previous error was not found
S.ErrorMsg(oldpos, "ERROR not found");
}
}
return comment;
}

32
usr/gri/pretty/selftest.go Normal file
View File

@ -0,0 +1,32 @@
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
import P0 /* ERROR expected */ ; /* SYNC */
import P1 /* ERROR expected */ Flags /* SYNC */
import P2 /* ERROR expected */ 42 /* SYNC */
type S0 struct {
f0, f1, f2;
}
func /* ERROR receiver */ () f0() {} /* SYNC */
func /* ERROR receiver */ (*S0, *S0) f1() {} /* SYNC */
func f0(a b, c /* ERROR type */ ) {}
func f1() {
}
func main () {
}
func /* ERROR EOF */

55
usr/gri/pretty/test.sh
View File

@ -8,44 +8,45 @@ TMP1=test_tmp1.go
TMP2=test_tmp2.go
COUNT=0
count() {
let COUNT=$COUNT+1
let M=$COUNT%10
if [ $M == 0 ]; then
echo -n "."
fi
}
apply1() {
#echo $1 $2
$1 $2
let COUNT=$COUNT+1
count
}
apply() {
for F in \
$GOROOT/usr/gri/pretty/*.go \
$GOROOT/usr/gri/gosrc/*.go \
$GOROOT/test/235.go \
$GOROOT/test/args.go \
$GOROOT/test/bufiolib.go \
$GOROOT/test/char_lit.go \
$GOROOT/test/complit.go \
$GOROOT/test/const.go \
$GOROOT/test/dialgoogle.go \
$GOROOT/test/empty.go \
$GOROOT/test/env.go \
$GOROOT/test/float_lit.go \
$GOROOT/test/fmt_test.go \
$GOROOT/test/for.go \
$GOROOT/test/func.go \
$GOROOT/test/func1.go \
$GOROOT/test/func2.go \
$GOROOT/test/*.go \
$GOROOT/src/pkg/*.go \
$GOROOT/src/lib/*.go \
$GOROOT/src/lib/*/*.go \
$GOROOT/usr/r/*/*.go
do
apply1 $1 $F
case `basename $F` in
selftest.go | func3.go ) ;; # skip - these are test cases for syntax errors
* ) apply1 $1 $F ;;
esac
done
}
cleanup() {
rm -f $TMP1 $TMP2
}
silent() {
cleanup
pretty -s $1 > $TMP1
@ -56,6 +57,7 @@ silent() {
fi
}
idempotent() {
cleanup
pretty $1 > $TMP1
@ -68,6 +70,7 @@ idempotent() {
fi
}
runtest() {
#echo "Testing silent mode"
cleanup
@ -78,6 +81,7 @@ runtest() {
$1 idempotent $2
}
runtests() {
if [ $# == 0 ]; then
runtest apply
@ -88,8 +92,21 @@ runtests() {
fi
}
# run selftest always
pretty -t selftest.go > $TMP1
if [ $? != 0 ]; then
cat $TMP1
echo "Error (selftest): pretty -t selftest.go"
exit 1
fi
count
# run over all .go files
runtests $*
cleanup
let COUNT=$COUNT/2 # divide by number of tests in runtest
echo "PASSED ($COUNT files)"
# done
echo
echo "PASSED ($COUNT tests)"