diff --git a/vlib/compiler/scanner.v b/vlib/compiler/scanner.v index 277e64c126..f0f929fbab 100644 --- a/vlib/compiler/scanner.v +++ b/vlib/compiler/scanner.v @@ -120,7 +120,7 @@ fn filter_num_sep(txt byteptr, start int, end int) string { i++ } b[i1]=0 // C string compatibility - return string{str:b len:i1} + return string(b, i1) } } @@ -260,10 +260,10 @@ fn (s mut Scanner) ident_dec_number() string { } } else if !(s.text[s.pos] in [`)`, `e`, `E`]) { - call_method = true + call_method = true s.pos-- - } - } + } + } } // scan exponential part mut has_exponential_part := false diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v index 8c6d4b377c..05fd4991ba 100644 --- a/vlib/v/parser/parser.v +++ b/vlib/v/parser/parser.v @@ -667,7 +667,7 @@ pub fn (p mut Parser) name_expr() ast.Expr { } else if p.peek_tok.kind == .lcbr && (p.tok.lit[0].is_capital() || is_c || // - p.tok.lit in table.builtin_type_names) && + (p.builtin_mod && p.tok.lit in table.builtin_type_names)) && // (p.tok.lit.len == 1 || !p.tok.lit[p.tok.lit.len - 1].is_capital()) // @@ -822,7 +822,7 @@ pub fn (p mut Parser) expr(precedence int) ast.Expr { p.error('unknown variable `$name`') return node } - println('assoc var $name typ=$var.typ') + // println('assoc var $name typ=$var.typ') mut fields := []string mut vals := []ast.Expr p.check(.pipe) diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v index 6899d85c56..d7fb9c0ea7 100644 --- a/vlib/v/scanner/scanner.v +++ b/vlib/v/scanner/scanner.v @@ -124,10 +124,7 @@ fn filter_num_sep(txt byteptr, start int, end int) string { i++ } b[i1] = 0 // C string compatibility - return string{ - str: b - len: i1 - } + return string(b,i1) } } @@ -221,7 +218,7 @@ fn (s mut Scanner) ident_oct_number() string { fn (s mut Scanner) ident_dec_number() string { mut has_wrong_digit := false mut first_wrong_digit := `\0` - mut call_method := false // true for, e.g., 12.str(), 12.3.str(), 12e-3.str() + mut call_method := false // true for, e.g., 12.str(), 12.3.str(), 12e-3.str() start_pos := s.pos // scan integer part for s.pos < s.text.len { @@ -253,7 +250,7 @@ fn (s mut Scanner) ident_dec_number() string { c := s.text[s.pos] if !c.is_digit() { if !c.is_letter() || c in [`e`, `E`] || s.inside_string { - if c == `.` && s.pos + 1 < s.text.len && !s.text[s.pos+1].is_digit() && s.text[s.pos+1] != `)` { + if c == `.` && s.pos + 1 < s.text.len && !s.text[s.pos + 1].is_digit() && s.text[s.pos + 1] != `)` { call_method = true } break @@ -267,10 +264,10 @@ fn (s mut Scanner) ident_dec_number() string { } } else if !(s.text[s.pos] in [`)`, `e`, `E`]) { - call_method = true + call_method = true s.pos-- - } - } + } + } } // scan exponential part mut has_exponential_part := false @@ -284,7 +281,7 @@ fn (s mut Scanner) ident_dec_number() string { c := s.text[s.pos] if !c.is_digit() { if !c.is_letter() || s.inside_string { - if c == `.` && s.pos + 1 < s.text.len && !s.text[s.pos+1].is_digit() && s.text[s.pos+1] != `)` { + if c == `.` && s.pos + 1 < s.text.len && !s.text[s.pos + 1].is_digit() && s.text[s.pos + 1] != `)` { call_method = true } break @@ -589,7 +586,7 @@ pub fn (s mut Scanner) scan() token.Token { } if name == 'VEXE' { vexe := pref.vexe_path() - return s.scan_res(.string, cescaped_path( vexe ) ) + return s.scan_res(.string, cescaped_path(vexe)) } if name == 'FILE' { return s.scan_res(.string, cescaped_path(os.real_path(s.file_path))) @@ -785,7 +782,7 @@ pub fn (s mut Scanner) scan() token.Token { } s.pos++ if s.comments_mode == .parse_comments { - comment := s.text[start..(s.pos-1)].trim_space() + comment := s.text[start..(s.pos - 1)].trim_space() return s.scan_res(.mline_comment, comment) } // Skip if not in fmt mode