- first (global) idents with proper links to declarations in html output
(e.g. pretty -html source.go > source.html; then look at the html.file in a browser)
R=r
OCL=22331
CL=22331
diff --git a/usr/gri/pretty/Makefile b/usr/gri/pretty/Makefile
index 1386c0c..82a25b0 100644
--- a/usr/gri/pretty/Makefile
+++ b/usr/gri/pretty/Makefile
@@ -37,7 +37,7 @@
platform.6: utils.6
-printer.6: scanner.6 ast.6 globals.6 object.6 type.6
+printer.6: scanner.6 ast.6 globals.6 object.6 type.6 utils.6
typechecker.6: ast.6 universe.6 globals.6 type.6
diff --git a/usr/gri/pretty/globals.go b/usr/gri/pretty/globals.go
index 199a8c9..4ad3bba 100644
--- a/usr/gri/pretty/globals.go
+++ b/usr/gri/pretty/globals.go
@@ -25,6 +25,8 @@
// or nesting level (pnolev).
export type Object struct {
+ id int; // unique id
+
exported bool;
pos int; // source position (< 0 if unknown position)
kind int;
@@ -38,6 +40,8 @@
export type Type struct {
+ id int; // unique id
+
ref int; // for exporting only: >= 0 means already exported
form int;
size int; // in bytes
@@ -108,23 +112,34 @@
// Creation
export var Universe_void_typ *Type // initialized by Universe to Universe.void_typ
+var ObjectId int;
export func NewObject(pos, kind int, ident string) *Object {
obj := new(Object);
+ obj.id = ObjectId;
+ ObjectId++;
+
obj.exported = false;
obj.pos = pos;
obj.kind = kind;
obj.ident = ident;
obj.typ = Universe_void_typ;
obj.pnolev = 0;
+
return obj;
}
+var TypeId int;
+
export func NewType(form int) *Type {
typ := new(Type);
+ typ.id = TypeId;
+ TypeId++;
+
typ.ref = -1; // not yet exported
typ.form = form;
+
return typ;
}
diff --git a/usr/gri/pretty/parser.go b/usr/gri/pretty/parser.go
index fa59256..7831ca8 100644
--- a/usr/gri/pretty/parser.go
+++ b/usr/gri/pretty/parser.go
@@ -163,12 +163,13 @@
}
-func (P *Parser) Lookup(ident string) *Globals.Object {
- for scope := P.top_scope; scope != nil; scope = scope.parent {
+func Lookup(scope *Globals.Scope, ident string) *Globals.Object {
+ for scope != nil {
obj := scope.Lookup(ident);
if obj != nil {
return obj;
}
+ scope = scope.parent;
}
return nil;
}
@@ -244,16 +245,25 @@
func (P *Parser) ParseDeclaration() *AST.Decl;
-func (P *Parser) ParseIdent() *AST.Expr {
+// If scope != nil, lookup identifier in scope. Otherwise create one.
+func (P *Parser) ParseIdent(scope *Globals.Scope) *AST.Expr {
P.Trace("Ident");
-
+
x := AST.BadExpr;
if P.tok == Scanner.IDENT {
- obj := Globals.NewObject(P.pos, Object.NONE, P.val);
+ var obj *Globals.Object;
+ if scope != nil {
+ obj = Lookup(scope, P.val);
+ }
+ if obj == nil {
+ obj = Globals.NewObject(P.pos, Object.NONE, P.val);
+ } else {
+ assert(obj.kind != Object.NONE);
+ }
x = AST.NewLit(P.pos, Scanner.IDENT, obj);
if P.verbose {
P.PrintIndent();
- print("Ident = \"", x.obj.ident, "\"\n");
+ print("Ident = \"", P.val, "\"\n");
}
P.Next();
} else {
@@ -269,11 +279,11 @@
P.Trace("IdentList");
var last *AST.Expr;
- x := P.ParseIdent();
+ x := P.ParseIdent(nil);
for P.tok == Scanner.COMMA {
pos := P.pos;
P.Next();
- y := P.ParseIdent();
+ y := P.ParseIdent(nil);
if last == nil {
x = P.NewExpr(pos, Scanner.COMMA, x, y);
last = x;
@@ -318,11 +328,11 @@
func (P *Parser) ParseQualifiedIdent() *AST.Expr {
P.Trace("QualifiedIdent");
- x := P.ParseIdent();
+ x := P.ParseIdent(P.top_scope);
for P.tok == Scanner.PERIOD {
pos := P.pos;
P.Next();
- y := P.ParseIdent();
+ y := P.ParseIdent(nil);
x = P.NewExpr(pos, Scanner.PERIOD, x, y);
}
@@ -390,7 +400,7 @@
func (P *Parser) ParseVarDecl(expect_ident bool) *AST.Type {
t := AST.BadType;
if expect_ident {
- x := P.ParseIdent();
+ x := P.ParseIdent(nil);
t = AST.NewType(x.pos, Scanner.IDENT);
t.expr = x;
} else if P.tok == Scanner.ELLIPSIS {
@@ -802,7 +812,7 @@
x := AST.BadExpr;
switch P.tok {
case Scanner.IDENT:
- x = P.ParseIdent();
+ x = P.ParseIdent(P.top_scope);
case Scanner.LPAREN:
// TODO we could have a function type here as in: new(())
@@ -850,7 +860,7 @@
P.Expect(Scanner.PERIOD);
if P.tok == Scanner.IDENT {
- x.y = P.ParseIdent();
+ x.y = P.ParseIdent(nil);
} else {
P.Expect(Scanner.LPAREN);
@@ -991,7 +1001,7 @@
case Scanner.LPAREN: x = P.ParseCall(x);
case Scanner.LBRACE:
// assume a composite literal only if x could be a type
- // and if we are not inside control clause (expr_lev >= 0)
+ // and if we are not inside a control clause (expr_lev >= 0)
// (composites inside control clauses must be parenthesized)
var t *AST.Type;
if P.expr_lev >= 0 {
@@ -1196,7 +1206,7 @@
s := AST.NewStat(P.pos, tok);
P.Expect(tok);
if tok != Scanner.FALLTHROUGH && P.tok == Scanner.IDENT {
- s.expr = P.ParseIdent();
+ s.expr = P.ParseIdent(P.top_scope);
}
P.Ecart();
@@ -1476,7 +1486,7 @@
P.Error(P.pos, `"import ." not yet handled properly`);
P.Next();
} else if P.tok == Scanner.IDENT {
- d.ident = P.ParseIdent();
+ d.ident = P.ParseIdent(nil);
}
if P.tok == Scanner.STRING {
@@ -1519,7 +1529,7 @@
P.Trace("TypeSpec");
d := AST.NewDecl(pos, Scanner.TYPE, exported);
- d.ident = P.ParseIdent();
+ d.ident = P.ParseIdent(nil);
d.typ = P.ParseType();
P.opt_semi = true;
@@ -1619,7 +1629,7 @@
}
}
- d.ident = P.ParseIdent();
+ d.ident = P.ParseIdent(nil);
d.typ = P.ParseFunctionType();
d.typ.key = recv;
@@ -1698,7 +1708,7 @@
P.OpenScope();
p := AST.NewProgram(P.pos);
P.Expect(Scanner.PACKAGE);
- p.ident = P.ParseIdent();
+ p.ident = P.ParseIdent(nil);
// package body
{ P.OpenScope();
diff --git a/usr/gri/pretty/printer.go b/usr/gri/pretty/printer.go
index 10dc45d..2338ab2 100644
--- a/usr/gri/pretty/printer.go
+++ b/usr/gri/pretty/printer.go
@@ -11,6 +11,7 @@
"tabwriter";
"flag";
"fmt";
+ Utils "utils";
Globals "globals";
Object "object";
Scanner "scanner";
@@ -115,8 +116,8 @@
var esc string;
for i := 0; i < len(s); i++ {
switch s[i] {
- case '<': esc = "<";
- case '&': esc = "&";
+ case '<': esc = "<";
+ case '&': esc = "&";
default: continue;
}
return s[0 : i] + esc + HtmlEscape(s[i+1 : len(s)]);
@@ -365,12 +366,24 @@
}
-func (P *Printer) HtmlIdentifier(pos int, obj *Globals.Object) {
- if html.BVal() {
- // no need to HtmlEscape ident
- P.TaggedString(pos, `<a href="#` + obj.ident + `">`, obj.ident, `</a>`);
+func (P *Printer) HtmlIdentifier(x *AST.Expr) {
+ if x.tok != Scanner.IDENT {
+ panic();
+ }
+ obj := x.obj;
+ if html.BVal() && obj.kind != Object.NONE {
+ // depending on whether we have a declaration or use, generate different html
+ // - no need to HtmlEscape ident
+ id := Utils.IntToString(obj.id, 10);
+ if x.pos == obj.pos {
+ // probably the declaration of x
+ P.TaggedString(x.pos, `<a name="id` + id + `">`, obj.ident, `</a>`);
+ } else {
+ // probably not the declaration of x
+ P.TaggedString(x.pos, `<a href="#id` + id + `">`, obj.ident, `</a>`);
+ }
} else {
- P.String(pos, obj.ident);
+ P.String(x.pos, obj.ident);
}
}
@@ -517,7 +530,7 @@
P.Type(x.t);
case Scanner.IDENT:
- P.HtmlIdentifier(x.pos, x.obj);
+ P.HtmlIdentifier(x);
case Scanner.INT, Scanner.STRING, Scanner.FLOAT:
// literal
@@ -867,7 +880,8 @@
text := tabwriter.New(os.Stdout, int(tabwidth.IVal()), 1, padchar, true, html.BVal());
P.Init(text, prog.comments);
- P.HtmlPrologue("<the source>");
+ // TODO would be better to make the name of the src file be the title
+ P.HtmlPrologue("package " + prog.ident.obj.ident);
P.Program(prog);
P.HtmlEpilogue();
