parser: keep track of the number of all scanned tokens too, and show …

…it with `-stats`
vlang · Jan 29, 2025 · d0ce8a2 · d0ce8a2
1 parent 8d51820
commit d0ce8a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
@@ -983,6 +983,7 @@ pub struct File {
 pub:
 	nr_lines      int    // number of source code lines in the file (including newlines and comments)
 	nr_bytes      int    // number of processed source code bytes
+	nr_tokens     int    // number of processed tokens in the source code of the file
 	mod           Module // the module of the source file (from `module xyz` at the top)
 	global_scope  &Scope = unsafe { nil }
 	is_test       bool // true for _test.v files

diff --git a/vlib/v/builder/rebuilding.v b/vlib/v/builder/rebuilding.v
@@ -335,22 +335,25 @@ pub fn (mut b Builder) rebuild(backend_cb FnBackend) {
 	if b.pref.is_stats {
 		compilation_time_micros := 1 + sw.elapsed().microseconds()
 		scompilation_time_ms := util.bold('${f64(compilation_time_micros) / 1000.0:6.3f}')
-		mut all_v_source_lines, mut all_v_source_bytes := 0, 0
+		mut all_v_source_lines, mut all_v_source_bytes, mut all_v_source_tokens := 0, 0, 0
 		for pf in b.parsed_files {
 			all_v_source_lines += pf.nr_lines
 			all_v_source_bytes += pf.nr_bytes
+			all_v_source_tokens += pf.nr_tokens
 		}
 		mut sall_v_source_lines := all_v_source_lines.str()
 		mut sall_v_source_bytes := all_v_source_bytes.str()
+		mut sall_v_source_tokens := all_v_source_tokens.str()
 		mut sall_v_types := b.table.type_symbols.len.str()
 		mut sall_v_modules := b.table.modules.len.str()
 		mut sall_v_files := b.parsed_files.len.str()
 		sall_v_source_lines = util.bold('${sall_v_source_lines:10s}')
 		sall_v_source_bytes = util.bold('${sall_v_source_bytes:10s}')
+		sall_v_source_tokens = util.bold('${sall_v_source_tokens:10s}')
 		sall_v_types = util.bold('${sall_v_types:5s}')
 		sall_v_modules = util.bold('${sall_v_modules:5s}')
 		sall_v_files = util.bold('${sall_v_files:5s}')
-		println('        V  source  code size: ${sall_v_source_lines} lines, ${sall_v_source_bytes} bytes, ${sall_v_types} types, ${sall_v_modules} modules, ${sall_v_files} files')
+		println('        V  source  code size: ${sall_v_source_lines} lines, ${sall_v_source_tokens} tokens, ${sall_v_source_bytes} bytes, ${sall_v_types} types, ${sall_v_modules} modules, ${sall_v_files} files')
 		//
 		mut slines := b.stats_lines.str()
 		mut sbytes := b.stats_bytes.str()

diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
@@ -340,6 +340,7 @@ pub fn (mut p Parser) parse() &ast.File {
 		is_translated:    p.is_translated
 		nr_lines:         p.scanner.line_nr
 		nr_bytes:         p.scanner.text.len
+		nr_tokens:        p.scanner.all_tokens.len
 		mod:              module_decl
 		imports:          p.ast_imports
 		imported_symbols: p.imported_symbols