v2: parse builtin.v, cfns.v float.v

vlib/builtin/builtin_nix.v

@@ -118,7 +118,7 @@ fn print_backtrace_skipping_top_frames_linux(skipframes int) bool {
 				if output in ['??:0:', '??:?:'] {
 					output = ''
 				}
-				println('${output:-46s} | ${addr:14s} | $beforeaddr')
+				//println('${output:-46s} | ${addr:14s} | $beforeaddr') // QTODO
 			}
 			// C.backtrace_symbols_fd(*voidptr(&buffer[skipframes]), nr_actual_frames, 1)
 			return true

vlib/builtin/cfns.v

@@ -11,7 +11,7 @@ fn C.realloc(a byteptr, b int) byteptr
 fn C.qsort(voidptr, int, int, voidptr)
 
 
-fn C.sprintf(a ...voidptr) byteptr
+fn C.sprintf(a ...voidptr) int
 
 
 fn C.strlen(s byteptr) int
@@ -23,7 +23,6 @@ fn C.popen(c byteptr, t byteptr) voidptr
 // <execinfo.h>
 fn backtrace(a voidptr, b int) int
 
-
 fn backtrace_symbols(voidptr, int)  &byteptr
 
 

vlib/builtin/int.v

@@ -155,14 +155,14 @@ pub fn (n int) hex() string {
 pub fn (n i64) hex() string {
 	len := if n >= i64(0) { n.str().len + 3 } else { 19 }
 	hex := malloc(len)
-	count := int(C.sprintf(charptr(hex), '0x%'C.PRIx64, n))
+	count := C.sprintf(charptr(hex), '0x%'C.PRIx64, n)
 	return tos(hex, count)
 }
 
 pub fn (n u64) hex() string {
 	len := if n >= u64(0) { n.str().len + 3 } else { 19 }
 	hex := malloc(len)
-	count := int(C.sprintf(charptr(hex), '0x%'C.PRIx64, n))
+	count := C.sprintf(charptr(hex), '0x%'C.PRIx64, n)
 	return tos(hex, count)
 }
 

vlib/compiler/fn.v

@@ -903,7 +903,8 @@ fn (p mut Parser) fn_args(f mut Fn) {
 	}
 	// `(int, string, int)`
 	// Just register fn arg types
-	types_only := p.tok == .mul || p.tok == .amp || (p.peek() == .comma && p.table.known_type(p.lit)) || p.peek() == .rpar // (int, string)
+	types_only := p.tok == .mul || p.tok == .amp || (p.peek() == .comma &&
+p.table.known_type(p.lit)) || p.peek() == .rpar // (int, string)
 	if types_only {
 		for p.tok != .rpar {
 			typ := p.get_type()

vlib/v/ast/ast.v

@@ -8,12 +8,13 @@ import (
 	v.table
 )
 
-pub type Expr = InfixExpr | IfExpr | StringLiteral | IntegerLiteral | 	
+pub type Expr = InfixExpr | IfExpr | StringLiteral | IntegerLiteral | CharLiteral | 	
 FloatLiteral | Ident | CallExpr | BoolLiteral | StructInit | ArrayInit | SelectorExpr | PostfixExpr | 	
 AssignExpr | PrefixExpr | MethodCallExpr | IndexExpr | RangeExpr
 
 pub type Stmt = VarDecl | GlobalDecl | FnDecl | Return | Module | Import | ExprStmt | 	
-ForStmt | StructDecl | ForCStmt | ForInStmt | CompIf | ConstDecl | Attr | BranchStmt
+ForStmt | StructDecl | ForCStmt | ForInStmt | CompIf | ConstDecl | Attr | BranchStmt | 	
+HashStmt
 // | IncDecStmt k
 // Stand-alone expression in a statement list.
 pub struct ExprStmt {
@@ -38,6 +39,11 @@ pub:
 	val string
 }
 
+pub struct CharLiteral {
+pub:
+	val string
+}
+
 pub struct BoolLiteral {
 pub:
 	val bool
@@ -304,6 +310,12 @@ pub struct ReturnStmt {
 	results  []Expr
 }
 
+// #include etc
+pub struct HashStmt {
+pub:
+	name string
+}
+
 /*
 pub struct AssignStmt {
 pub:

vlib/v/parser/fn.v

@@ -50,13 +50,19 @@ pub fn (p mut Parser) call_args() []ast.Expr {
 	return args // ,table.void_ti
 }
 
-fn (p mut Parser) fn_decl(/*high bool*/) ast.FnDecl {
+fn (p mut Parser) fn_decl() ast.FnDecl {
 	is_pub := p.tok.kind == .key_pub
 	if is_pub {
 		p.next()
 	}
 	p.table.clear_vars()
 	p.check(.key_fn)
+	// C.
+	is_c := p.tok.kind == .name && p.tok.lit == 'C'
+	if is_c {
+		p.next()
+		p.check(.dot)
+	}
 	// Receiver?
 	mut rec_name := ''
 	mut is_method := false
@@ -91,6 +97,18 @@ fn (p mut Parser) fn_decl(/*high bool*/) ast.FnDecl {
 	// Args
 	mut args := []table.Var
 	mut ast_args := []ast.Arg
+	// `int, int, string` (no names, just types)
+	types_only := p.tok.kind == .amp || (p.peek_tok.kind == .comma && p.table.known_type(p.tok.lit)) || p.peek_tok.kind == .rpar
+	if types_only {
+		p.warn('types only')
+		for p.tok.kind != .rpar {
+			p.parse_type()
+			if p.tok.kind == .comma {
+				p.next()
+			}
+		}
+	}
+	else {
 		for p.tok.kind != .rpar {
 			mut arg_names := [p.check_name()]
 			// `a, b, c int`
@@ -118,10 +136,11 @@ fn (p mut Parser) fn_decl(/*high bool*/) ast.FnDecl {
 				p.check(.comma)
 			}
 		}
+	}
 	p.check(.rpar)
 	// Return type
 	mut typ := table.void_type
-	if p.tok.kind in [.name, .lpar] {
+	if p.tok.kind in [.name, .lpar, .amp] {
 		typ = p.parse_type()
 		p.return_type = typ
 	}
@@ -145,7 +164,10 @@ fn (p mut Parser) fn_decl(/*high bool*/) ast.FnDecl {
 			return_type: typ
 		})
 	}
-	stmts := p.parse_block()
+	mut stmts := []ast.Stmt
+	if p.tok.kind == .lcbr {
+		stmts = p.parse_block()
+	}
 	return ast.FnDecl{
 		name: name
 		stmts: stmts

vlib/v/parser/parse_type.v

@@ -2,7 +2,6 @@ module parser
 // Copyright (c) 2019-2020 Alexander Medvednikov. All rights reserved.
 // Use of this source code is governed by an MIT license
 // that can be found in the LICENSE file.
-
 import (
 	v.table
 )
@@ -77,6 +76,10 @@ pub fn (p mut Parser) parse_type() table.Type {
 		p.check(.amp)
 		nr_muls++
 	}
+	if p.tok.lit == 'C' {
+		p.next()
+		p.check(.dot)
+	}
 	name := p.tok.lit
 	match p.tok.kind {
 		// func
@@ -173,4 +176,3 @@ pub fn (p mut Parser) parse_type() table.Type {
 		}
 	}
 }
-

vlib/v/parser/parser.v

@@ -195,8 +195,11 @@ pub fn (p mut Parser) top_stmt() ast.Stmt {
 		.dollar {
 			return p.comp_if()
 		}
+		.hash {
+			return p.hash()
+		}
 		else {
-			p.error('bad top level statement')
+			p.error('parser: bad top level statement')
 			return ast.Stmt{}
 		}
 	}
@@ -457,8 +460,15 @@ pub fn (p mut Parser) expr(precedence int) (ast.Expr,table.Type) {
 		.str {
 			node,typ = p.string_expr()
 		}
-		// -1, -a etc
+		.chartoken {
-		.minus, .amp, .mul {
+			typ = table.byte_type
+			node = ast.CharLiteral{
+				val: p.tok.lit
+			}
+			p.next()
+		}
+		// -1, -a, !x, &x etc
+		.minus, .amp, .mul, .not {
 			node,typ = p.prefix_expr()
 		}
 		// .amp {
@@ -485,6 +495,13 @@ pub fn (p mut Parser) expr(precedence int) (ast.Expr,table.Type) {
 		.lsbr {
 			node,typ = p.array_init()
 		}
+		.key_sizeof {
+			p.next()
+			p.check(.lpar)
+			p.next()
+			p.check(.rpar)
+			typ = table.int_type
+		}
 		else {
 			p.error('pexpr(): bad token `$p.tok.str()`')
 		}
@@ -755,6 +772,9 @@ fn (p mut Parser) string_expr() (ast.Expr,table.Type) {
 		}
 		p.check(.str_dollar)
 		p.expr(0)
+		if p.tok.kind == .semicolon {
+			p.next()
+		}
 	}
 	return node,table.string_type
 }
@@ -994,6 +1014,13 @@ fn (p mut Parser) var_decl() ast.VarDecl {
 	return node
 }
 
+fn (p mut Parser) hash() ast.HashStmt {
+	p.next()
+	return ast.HashStmt{
+		name: p.tok.lit
+	}
+}
+
 fn (p mut Parser) global_decl() ast.GlobalDecl {
 	if !p.pref.translated && !p.pref.is_live && !p.builtin_mod && !p.pref.building_v && p.mod != 'ui' && p.mod != 'gg2' && p.mod != 'uiold' && !os.getwd().contains('/volt') && !p.pref.enable_globals {
 		p.error('use `v --enable-globals ...` to enable globals')

vlib/v/table/atypes.v

@@ -92,6 +92,11 @@ pub const (
 		name: 'bool'
 		idx: bool_type_idx
 	}
+	byte_type = Type{
+		kind: .byte
+		name: 'byte'
+		idx: byte_type_idx
+	}
 )
 /*
 pub fn (t Type) str() string {

vlib/v/table/table.v

@@ -251,6 +251,13 @@ pub fn (t mut Table) register_type(typ Type) int {
 	return idx
 }
 
+pub fn (t &Table) known_type(name string) bool {
+	_ = t.find_type(name) or {
+		return false
+	}
+	return true
+}
+
 pub fn (t mut Table) find_or_register_map(key_typ &Type, value_typ &Type) (int,string) {
 	name := 'map_${key_typ.name}_${value_typ.name}'
 	// existing

vlib/v/token/token.v

@@ -372,7 +372,7 @@ pub fn (tok Token) precedence() int {
 			return 7
 		}
 		// `*` |  `/` | `%` | `<<` | `>>` | `&`
-		.mul, .div, .left_shift, .righ_shift, .amp {
+		.mul, .div, .mod, .left_shift, .righ_shift, .amp {
 			return 6
 		}
 		// `+` |  `-` |  `|` | `^`
@@ -391,6 +391,9 @@ pub fn (tok Token) precedence() int {
 		.logical_or, .assign, .plus_assign, .minus_assign, .div_assign, .mult_assign {
 			return 2
 		}
+		.key_in {
+			return 1
+		}
 		// /.plus_assign {
 		// /return 2
 		// /}
@@ -456,5 +459,5 @@ pub fn (tok Kind) is_relational() bool {
 }
 
 pub fn (kind Kind) is_infix() bool {
-	return kind in [.plus, .minus, .mod, .mul, .div, .eq, .ne, .gt, .lt, .ge, .le, .logical_or, .and, .dot, .pipe, .left_shift]
+	return kind in [.plus, .minus, .mod, .mul, .div, .eq, .ne, .gt, .lt, .key_in, .ge, .le, .logical_or, .and, .dot, .pipe, .left_shift]
 }