vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: check fn main(); vfmt: fix for{}, module and module comments

pull/4340/head
Alexander Medvednikov 2020-04-10 22:27:51 +02:00
parent fdac3a1f2e
commit b95a47b5a7
6 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/v/v.v
View File

@ -103,7 +103,7 @@ fn main() {
}
else {}
}
if command in ['run', 'build'] || command.ends_with('.v') || os.exists(command) {
if command in ['run', 'build-module'] || command.ends_with('.v') || os.exists(command) {
//println('command')
//println(prefs.path)
builder.compile(command, prefs)
@ -179,7 +179,7 @@ fn parse_args(args []string) (&pref.Preferences, string) {
res.path = args[command_pos+1]
res.run_args = args[command_pos+1..]
}
if command == 'build' {
if command == 'build-module' {
res.build_mode = .build_module
res.path = args[command_pos+1]
}

2
vlib/v/ast/str.v
View File

@ -19,7 +19,7 @@ pub fn (node &FnDecl) str(t &table.Table) string {
mut styp := t.type_to_str(node.receiver.typ)
mut m := if node.rec_mut { 'mut ' } else { '' }
if node.rec_mut {
styp = styp[1..] // remove &
styp = styp[1..] // remove &
}
receiver = '($node.receiver.name $m$styp) '
/*

11
vlib/v/checker/checker.v
View File

@ -60,6 +60,17 @@ pub fn (c mut Checker) check_files(ast_files []ast.File) {
for file in ast_files {
c.check(file)
}
// Make sure fn main is defined in non lib builds
if c.pref.build_mode == .build_module {
return
}
for i, f in c.table.fns {
if f.name == 'main' {
return
}
}
eprintln('function `main` is undeclared in the main module')
exit(1)
}
pub fn (c mut Checker) struct_init(struct_init mut ast.StructInit) table.Type {

8
vlib/v/fmt/fmt.v
View File

@ -36,7 +36,7 @@ pub fn fmt(file ast.File, table &table.Table) string {
file: file
}
f.cur_mod = 'main'
for stmt in file.stmts {
for i, stmt in file.stmts {
f.stmt(stmt)
}
// for comment in file.comments { println('$comment.line_nr $comment.text') }
@ -279,7 +279,11 @@ fn (f mut Fmt) stmt(node ast.Stmt) {
ast.ForStmt {
f.write('for ')
f.expr(it.cond)
f.writeln(' {')
if it.is_inf {
f.writeln('{')
} else {
f.writeln(' {')
}
f.stmts(it.stmts)
f.writeln('}')
}

1
vlib/v/gen/cgen.v
View File

@ -466,6 +466,7 @@ fn (g mut Gen) stmt(node ast.Stmt) {
ast.InterfaceDecl {
g.writeln('// interface')
}
ast.Module {}
ast.Return {
if g.defer_stmts.len > 0 {
g.write_defer_stmts()

61
vlib/v/parser/parser.v
View File

@ -68,7 +68,7 @@ pub fn parse_file(path string, table &table.Table, comments_mode scanner.Comment
scanner: scanner.new_scanner_file(path, comments_mode)
table: table
file_name: path
file_name_dir: os.dir( path )
file_name_dir: os.dir(path)
pref: pref
scope: &ast.Scope{
start_pos: 0
@ -78,12 +78,16 @@ pub fn parse_file(path string, table &table.Table, comments_mode scanner.Comment
}
// comments_mode: comments_mode
p.read_first_token()
// module decl
module_decl := if p.tok.kind == .key_module { p.module_decl() } else { ast.Module{
name: 'main'
} }
p.mod = module_decl.name
p.builtin_mod = p.mod == 'builtin'
for p.tok.kind == .comment {
mut stmt := ast.Stmt{} // TODO sum type << bug
com := p.comment()
stmt = com
stmts << stmt
}
mut mstmt := ast.Stmt{}
module_decl := p.module_decl()
mstmt = module_decl
stmts << mstmt
// imports
/*
mut imports := []ast.Import
@ -92,7 +96,7 @@ pub fn parse_file(path string, table &table.Table, comments_mode scanner.Comment
}
*/
// TODO: import only mode
for {
for {
// res := s.scan()
if p.tok.kind == .eof {
// println('EOF, breaking')
@ -203,7 +207,7 @@ pub fn (p mut Parser) parse_block_no_scope() []ast.Stmt {
p.check(.lcbr)
mut stmts := []ast.Stmt
if p.tok.kind != .rcbr {
for {
for {
stmts << p.stmt()
// p.warn('after stmt(): tok=$p.tok.str()')
if p.tok.kind in [.eof, .rcbr] {
@ -250,6 +254,10 @@ fn (p mut Parser) check_name() string {
}
pub fn (p mut Parser) top_stmt() ast.Stmt {
if p.fileis('mmm.v') {
print('!!stmt()')
println(p.tok.kind.str())
}
match p.tok.kind {
.key_pub {
match p.peek_tok.kind {
@ -283,9 +291,6 @@ pub fn (p mut Parser) top_stmt() ast.Stmt {
.key_interface {
return p.interface_decl()
}
.key_module {
return p.module_decl()
}
.key_import {
node := p.import_stmt()
p.ast_imports << node
@ -852,14 +857,14 @@ pub fn (p mut Parser) expr(precedence int) ast.Expr {
// will fudge left shift as it makes it right assoc
// `arr << 'a'` | `arr << 'a' + 'b'`
tok := p.tok
pos := tok.position()
pos := tok.position()
p.next()
right := p.expr(precedence - 1)
node = ast.InfixExpr{
left: node
right: right
op: tok.kind
pos:pos
pos: pos
}
} else if p.tok.kind.is_infix() {
node = p.infix_expr(node)
@ -1348,7 +1353,7 @@ fn (p mut Parser) array_init() ast.ArrayInit {
last_pos := p.tok.position()
len := last_pos.pos - first_pos.pos
pos := token.Position{
line_nr: first_pos.line_nr,
line_nr: first_pos.line_nr
pos: first_pos.pos
len: len
}
@ -1403,10 +1408,14 @@ fn (p mut Parser) parse_number_literal() ast.Expr {
}
fn (p mut Parser) module_decl() ast.Module {
p.check(.key_module)
mod := p.check_name()
full_mod := p.table.qualify_module(mod, p.file_name)
mut name := 'main'
if p.tok.kind == .key_module {
p.check(.key_module)
name = p.check_name()
}
full_mod := p.table.qualify_module(name, p.file_name)
p.mod = full_mod
p.builtin_mod = p.mod == 'builtin'
return ast.Module{
name: full_mod
}
@ -1650,7 +1659,7 @@ fn (p mut Parser) return_stmt() ast.Return {
pos: p.tok.position()
}
}
for {
for {
expr := p.expr(0)
exprs << expr
if p.tok.kind == .comma {
@ -1669,7 +1678,7 @@ fn (p mut Parser) return_stmt() ast.Return {
// left hand side of `=` or `:=` in `a,b,c := 1,2,3`
fn (p mut Parser) parse_assign_lhs() []ast.Ident {
mut idents := []ast.Ident
for {
for {
is_mut := p.tok.kind == .key_mut
if is_mut {
p.check(.key_mut)
@ -1696,7 +1705,7 @@ fn (p mut Parser) parse_assign_lhs() []ast.Ident {
// right hand side of `=` or `:=` in `a,b,c := 1,2,3`
fn (p mut Parser) parse_assign_rhs() []ast.Expr {
mut exprs := []ast.Expr
for {
for {
expr := p.expr(0)
exprs << expr
if p.tok.kind == .comma {
@ -1804,7 +1813,7 @@ fn (p mut Parser) match_expr() ast.MatchExpr {
p.check(.lcbr)
mut branches := []ast.MatchBranch
mut have_final_else := false
for {
for {
comment := p.check_comment() // comment before {}
mut exprs := []ast.Expr
branch_pos := p.tok.position()
@ -1838,7 +1847,7 @@ fn (p mut Parser) match_expr() ast.MatchExpr {
is_sum_type = true
} else {
// Expression match
for {
for {
p.inside_match_case = true
expr := p.expr(0)
p.inside_match_case = false
@ -1918,8 +1927,6 @@ fn (p mut Parser) enum_decl() ast.EnumDecl {
return ast.EnumDecl{
name: name
is_pub: is_pub
// vals: vals
// default_exprs: default_exprs
fields: fields
}
}
@ -1935,7 +1942,7 @@ fn (p mut Parser) type_decl() ast.TypeDecl {
if p.tok.kind == .assign {
// type SumType = A | B | c
p.next()
for {
for {
variant_type := p.parse_type()
sum_variants << variant_type
if p.tok.kind != .pipe {
@ -1995,7 +2002,7 @@ fn (p mut Parser) assoc() ast.Assoc {
mut fields := []string
mut vals := []ast.Expr
p.check(.pipe)
for {
for {
fields << p.check_name()
p.check(.colon)
expr := p.expr(0)