diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38f0e589b1..c3e66a1932 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: brew install freetype glfw openssl export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" - name: Build V - run: make && ./v -o v compiler + run: make && ./v -o v v.v - name: Build V using V - run: ./v -o v2 compiler && ./v2 -o v3 compiler + run: ./v -o v2 v.v && ./v2 -o v3 v.v - name: Test v->c run: ./v test v - name: Test v->js @@ -36,7 +36,7 @@ jobs: - name: Install dependencies run: sudo apt-get update; sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev - name: Build v - run: make && ./v -cc gcc -o v compiler + run: make && ./v -cc gcc -o v v.v - name: Test v->c run: ./v test v - name: Test v->js @@ -49,13 +49,13 @@ jobs: - name: Install dependencies run: sudo apt-get update; sudo apt-get install --quiet -y tcc libglfw3 libglfw3-dev libfreetype6-dev libssl-dev - name: Build v - run: make && ./v -o v compiler + run: make && ./v -o v v.v - name: Test v->c with tcc env: VFLAGS: -cc tcc run: | tcc -version - ./v -o v2 compiler # Make sure vtcc can build itself + ./v -o v2 v.v # Make sure vtcc can build itself ./v test v build-windows-gcc: diff --git a/.travis.yml b/.travis.yml index 68d9ab9077..494cecd494 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ script: - | if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then make - ./v -o v compiler + ./v -o v v.v ./v test v fi - | diff --git a/vlib/builtin/js/map.v b/vlib/builtin/js/map.v index c77c5fc70c..c5639d5f83 100644 --- a/vlib/builtin/js/map.v +++ b/vlib/builtin/js/map.v @@ -22,9 +22,6 @@ struct map { //return false //} -fn (m mut map) _set(key string, val voidptr) { -} - //fn preorder_keys(node &mapnode, keys mut []string, key_i int) int { //return 0 //} @@ -40,7 +37,7 @@ fn (m map) get(key string, out voidptr) bool { pub fn (m mut map) delete(key string) { } -fn (m map) _exists(key string) bool { +fn (m map) exists(key string) bool { return false } diff --git a/vlib/compiler/cc.v b/vlib/compiler/cc.v index 94054ab0a2..e2f5bcd4ed 100644 --- a/vlib/compiler/cc.v +++ b/vlib/compiler/cc.v @@ -22,7 +22,7 @@ fn (v mut V) cc() { dir := os.dir(vexe) if !os.file_exists(vjs_path) { println('V.js compiler not found, building...') - ret := os.system('$vexe -o $vjs_path -os js $dir/compiler') + ret := os.system('$vexe -o $vjs_path -os js $dir/v.v') if ret == 0 { println('Done.') } else {