transform project into a CLI, restructure project

Signed-off-by: Hunam <[email protected]>

Author: Hunam6

.editorconfig

@@ -22,8 +22,5 @@ trim_trailing_whitespace = false
 # `too_long_line_length_other     = 100`
 max_line_length = 100
 
-[*.{txt,out}]
+[*.txt]
 insert_final_newline = false
-
-[{Makefile,GNUmakefile}]
-indent_style = tab

.gitignore

@@ -1,4 +0,0 @@
-go2v
-go2v.exe
-t_go2v
-t_go2v.exe

DESIGN.md

@@ -1,6 +1,6 @@
 # Go2V
 
-Go2V is a CLI utility with a function interface to transpile Go source code into V source code.
+Go2V is a CLI utility to transpile Go source code into V source code.
 
 ## Summary / steps
 
@@ -18,4 +18,4 @@ Go2V is a CLI utility with a function interface to transpile Go source code into
 - [ ] Adapt Go-ish things to V-ish things
   - `ast_constructor.v`
 - [ ] Transform the V AST struct into V Code
-  - `v_file_constructor.v`
+  - `v_file_constructor.v`

README.md

@@ -4,3 +4,7 @@ Go => V source code translator
 This project is an attempt to automate conversion of [Go](https://golang.org) source to [V](https://vlang.io/).
 
 Barely started... more to come.
+
+## Usage
+
+See `v run go2v.v help` 

go2v.v

@@ -1,68 +1,48 @@
-import os
-
-// TODO: add a system with a watcher function to make the tree construction stage concurrent and possibly also to the other stages
+module main
 
-struct Params {
-	outputs_file bool
-	input_str    string
-	input_path   string
-	output_path  string = 'out.v'
-	go_path      string = 'go'
-}
+import os
+import cli
+import transpiler
 
-// TODO TEMP REMOVE
 fn main() {
-	go_to_v(Params{
-		input_path: 'test.go'
-		// outputs_file: true
-	}) ?
-}
-
-pub fn go_to_v(options Params) ?string {
-	if !os.exists_in_system_path('go') {
-		// TODO: better error message
-		panic("Go is needed by the utility and it isn't installed or not present in your path, get it at https://golang.org or manually specify the path to the go binary by passing the --go-path parameter if using the CLI or the {go_path} parameter in the function call")
-	}
-
-	mut str := ''
-	mut had_to_create_a_file := false
-	mut input_path := options.input_path
-
-	if options.input_path == '' && options.input_str == '' {
-		panic('Either the input_path or input_str parameter must be set')
-	} else if options.input_path != '' && options.input_str != '' {
-		panic('Only one of the input_path or input_str parameter must be set')
-	} else if options.input_path != '' {
-		str = os.read_file(options.input_path) ?
-	} else {
-		str = options.input_str
-		input_path = 'temp'
-		had_to_create_a_file = true
-		os.write_file('temp', str) ?
-	}
-
-	os.execute('$options.go_path run ${os.resource_abs_path('/')}/get_ast.go -f $input_path -o $options.output_path')
-	raw_input := os.read_file(options.output_path) ?
-	os.rm(options.output_path) ?
-	if had_to_create_a_file {
-		os.rm(input_path) ?
-	}
-
-	input := raw_input.runes()
-	tokens := tokenizer(input)
-	tree := tree_constructor(tokens)
-	v_ast := ast_constructor(tree)
-	v_file := v_file_constructor(v_ast)
-
-	if options.outputs_file {
-		os.write_file(options.output_path, v_file) ?
+	mut app := cli.Command{
+		name: 'go2v'
+		description: 'Go2V is a CLI utility to transpile Go source code into V source code.'
+		execute: fn (cmd cli.Command) ? {
+			if cmd.args.len == 0 { println('Wrong usage, see "go2v help"') } else { transpiler.go_to_v(cmd.args[0], cmd.args[2] or {
+					''}) ? }
+			return
+		}
+		commands: [
+			cli.Command{
+				name: 'help'
+				execute: fn (cmd cli.Command) ? {
+					help_topic := cmd.args[0] or { 'help' }
+					println(os.read_file(os.resource_abs_path('/help/${help_topic}.txt')) or {
+						'No help topic for $help_topic'
+					})
+					return
+				}
+			},
+			cli.Command{
+				name: 'test'
+				execute: fn (cmd cli.Command) ? {
+					mut stats := ''
+					if cmd.args.len == 0 {
+						stats = '-stats'
+					} else if cmd.args[0] == '-compact' {
+						stats = ''
+					} else {
+						println('Wrong usage, see "go2v help test"')
+						return
+					}
+
+					os.execvp('${@VEXE}', [stats, 'test', os.resource_abs_path('/tests')]) ?
+					return
+				}
+			},
+		]
 	}
-
-	// TODO TEMP REMOVE
-	os.mkdir('test') or {}
-	os.write_file('test/tree', tree.str()) ?
-	os.write_file('test/ast', v_ast.str()) ?
-	os.write_file('test/file.v', v_file) ?
-
-	return v_file
+	app.setup()
+	app.parse(os.args)
 }

help/help.txt

@@ -0,0 +1,16 @@
+Go2V is a CLI utility to transpile Go source code into V source code.
+
+Usage:
+   go2v [options] [command] [arguments]
+
+	 Go must be in path.
+
+Examples:
+   v hello.go             Transpile the file `hello.go` and output it as `hello.v`.
+   v some_dir -o out_dir  (WIP) Transpile all files in the directory `some_dir` and output it in `out_dir`.
+
+Go2V supports the following commands:
+   test                   Go2V tests itself with its testing suite located in `tests`.
+   symlink                (WIP) Create a symbolic link for Go2V.
+
+Use "go2v help <command>" for more information about a command.

help/test.txt

@@ -0,0 +1,6 @@
+Usage:
+  go2v [option] test
+    Go2V tests itself with its testing suite located in `tests`.
+
+Options:
+  -compact     - Run tets without the `-stats` option.

functional_test.v tests/functional_test.v

@@ -1,3 +1,5 @@
+module transpiler
+
 import strings
 
 // TODO: handle comments

test.go tests/test.go

@@ -1,42 +1,25 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"go/parser"
 	"go/token"
 	"io"
-	"log"
 	"os"
 	"reflect"
 )
 
-//TODO: greatly simplify this code, for now I just copied the a piece of code given by *@JalonSolov#0531* on Discord
-
 func main() {
-	pathname := ""
-	outpathname := ""
-	flag.StringVar(&pathname, "f", "", "file to process")
-	flag.StringVar(&outpathname, "o", "", "file to output")
-	fmt.Println(pathname)
-	fmt.Println(outpathname)
-
-	flag.Parse()
+	path := os.Args[1]
 
 	fset := token.NewFileSet()
-	node, err := parser.ParseFile(fset, pathname, nil, parser.ParseComments)
-	if err != nil {
-		log.Fatal(err)
-	}
+	node, _ := parser.ParseFile(fset, path, nil, parser.ParseComments)
 
-	f, err := os.OpenFile(outpathname, os.O_WRONLY|os.O_CREATE, 0600)
-	if err != nil {
-		log.Fatal(err)
-	}
+	f, _ := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0600)
 	defer f.Close()
 
 	fprint(f, fset, node, NotNilFilter)
-	//TODO: find if there is a way to just use the built-in ast.Print() function, the only differences are:
+	//TODO: find if there is a way to just use the built-in ast.Print() function as the only differences are:
 	/*
 		FROM ast/print.go:
 		86
@@ -51,7 +34,6 @@ func main() {
 		104 -	}
 		105  	for j := p.indent; j > 0; j-- {
 	*/
-	// Maybe find a way to overwrite the variable `indent` and the function `printer.Write`
 }
 
 // A FieldFilter may be provided to Fprint to control the output.

ast_constructor.v transpiler/ast_constructor.v

@@ -0,0 +1,84 @@
+module transpiler
+
+import os
+
+// TODO: add a system with a watcher function to make the tree construction stage concurrent and possibly also to the other stages
+
+pub struct Params {
+	outputs_file bool
+	input_str    string
+	input_path   string
+	output_path  string = 'out.v'
+	go_path      string = 'go'
+}
+
+pub fn go_to_v(input_path string, output_path string) ? {
+	mut out_path := output_path
+
+	if !os.exists_in_system_path('go') {
+		panic("Go is needed by the utility and it isn't installed or not present in your path, get it at https://golang.org.")
+	}
+
+	if !os.exists(input_path) {
+		panic("The input file/directory doesn't exist.")
+	}
+
+	is_dir := os.is_dir(input_path)
+
+	// default output directory for directory transpilation
+	if output_path == '' && is_dir {
+		out_path = 'out'
+	}
+
+	mut inputs := []string{}
+	mut files_name := []string{}
+	if !is_dir {
+		inputs << os.read_file(input_path) ?
+		files_name << input_path#[..-3] + '.v'
+	} else {
+		for input in os.ls(input_path) or { []string{} } {
+			if input.ends_with('.go') {
+				inputs << os.read_file('$os.getwd()/$input_path/$input') ?
+				files_name << input#[..-3] + '.v'
+			}
+		}
+	}
+
+	// custom output file for file transpilation
+	if out_path != '' && !is_dir {
+		files_name[0] = out_path
+		out_path = '.'
+	}
+
+	if !is_dir {
+		convert_and_write(inputs.first(), files_name.first(), out_path) ?
+	} else {
+		os.mkdir(out_path) or {}
+		for i, input in inputs {
+			convert_and_write(input, files_name[i], out_path) ?
+		}
+	}
+}
+
+fn convert_and_write(input string, output_file string, output_path string) ? {
+	output := '$os.getwd()/$output_path/$output_file'
+	os.write_file(output, input) ?
+	os.execute('go run "${os.resource_abs_path('transpiler')}/get_ast.go" "$output"')
+
+	raw_input := os.read_file(output) ?
+	runes_input := raw_input.runes()
+	tokens := tokenizer(runes_input)
+	tree := tree_constructor(tokens)
+	v_ast := ast_constructor(tree)
+	v_file := v_file_constructor(v_ast)
+
+	// TODO TEMP REMOVE
+	/*
+	os.mkdir('test') or {}
+	os.write_file('test/tree', tree.str()) ?
+	os.write_file('test/ast', v_ast.str()) ?
+	os.write_file('test/file.v', v_file) ?
+	*/
+
+	os.write_file(output, v_file) ?
+}

get_ast.go transpiler/get_ast.go

@@ -1,3 +1,5 @@
+module transpiler
+
 enum State {
 	tree_name
 	body_name

transpiler/go2v.v

@@ -1,3 +1,5 @@
+module transpiler
+
 // it's best to use a struct instead of a sumtype because for the ast construction stage it make the code extremly complex to write and read
 struct Child {
 mut:

tokenizer.v transpiler/tokenizer.v

@@ -1,3 +1,5 @@
+module transpiler
+
 fn v_file_constructor(v_ast VAST) string {
 	mut v := v_ast
 	v.handle_module()

tree_constructor.v transpiler/tree_constructor.v

@@ -0,0 +1,7 @@
+Module {
+	name: 'go2v'
+	description: 'Go2V is a CLI utility to transpile Go source code into V source code.'
+	version: '0.0.1'
+	license: 'GPL-2.0'
+	dependencies: []
+}