diff options
| -rw-r--r-- | usr/gri/gosrc/globals.go (renamed from usr/gri/src/globals.go) | 4 | ||||
| -rwxr-xr-x | usr/gri/gosrc/object.go (renamed from usr/gri/src/object.go) | 0 | ||||
| -rw-r--r-- | usr/gri/gosrc/parser.go (renamed from usr/gri/src/parser.go) | 3 | ||||
| -rw-r--r-- | usr/gri/gosrc/scanner.go (renamed from usr/gri/src/scanner.go) | 0 | ||||
| -rw-r--r-- | usr/gri/gosrc/scope.go (renamed from usr/gri/src/scope.go) | 0 | ||||
| -rw-r--r-- | usr/gri/gosrc/test_parser.go (renamed from usr/gri/src/test_parser.go) | 0 | ||||
| -rw-r--r-- | usr/gri/gosrc/test_scanner.go (renamed from usr/gri/src/test_scanner.go) | 0 | ||||
| -rw-r--r-- | usr/gri/gosrc/type.go (renamed from usr/gri/src/type.go) | 0 |
8 files changed, 6 insertions, 1 deletions
diff --git a/usr/gri/src/globals.go b/usr/gri/gosrc/globals.go index f8d0c116b..986fbe82c 100644 --- a/usr/gri/src/globals.go +++ b/usr/gri/gosrc/globals.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package Globals; +package Globals // The following types should really be in their respective files @@ -49,6 +49,7 @@ type Scope struct { } +/* func (scope *Scope) Lookup(ident string) *Object { panic "UNIMPLEMENTED"; return nil; @@ -64,3 +65,4 @@ func (scope *Scope) InsertImport(obj *Object) *Object { panic "UNIMPLEMENTED"; return nil; } +*/ diff --git a/usr/gri/src/object.go b/usr/gri/gosrc/object.go index cf1a432aa..cf1a432aa 100755 --- a/usr/gri/src/object.go +++ b/usr/gri/gosrc/object.go diff --git a/usr/gri/src/parser.go b/usr/gri/gosrc/parser.go index 49b0f6ab2..0e025f9d3 100644 --- a/usr/gri/src/parser.go +++ b/usr/gri/gosrc/parser.go @@ -1046,10 +1046,13 @@ func (P *Parser) ParseProgram() { P.Trace("Program"); P.Expect(Scanner.PACKAGE); P.ParseIdent(); + P.Optional(Scanner.SEMICOLON); + for P.tok == Scanner.IMPORT { P.ParseImportDecl(); P.Optional(Scanner.SEMICOLON); } + for P.tok != Scanner.EOF { P.ParseDeclaration(); P.Optional(Scanner.SEMICOLON); diff --git a/usr/gri/src/scanner.go b/usr/gri/gosrc/scanner.go index 94d8f1915..94d8f1915 100644 --- a/usr/gri/src/scanner.go +++ b/usr/gri/gosrc/scanner.go diff --git a/usr/gri/src/scope.go b/usr/gri/gosrc/scope.go index 13a14ce49..13a14ce49 100644 --- a/usr/gri/src/scope.go +++ b/usr/gri/gosrc/scope.go diff --git a/usr/gri/src/test_parser.go b/usr/gri/gosrc/test_parser.go index 78d8d8711..78d8d8711 100644 --- a/usr/gri/src/test_parser.go +++ b/usr/gri/gosrc/test_parser.go diff --git a/usr/gri/src/test_scanner.go b/usr/gri/gosrc/test_scanner.go index 5ebff817b..5ebff817b 100644 --- a/usr/gri/src/test_scanner.go +++ b/usr/gri/gosrc/test_scanner.go diff --git a/usr/gri/src/type.go b/usr/gri/gosrc/type.go index 975adec68..975adec68 100644 --- a/usr/gri/src/type.go +++ b/usr/gri/gosrc/type.go |