Skip to content

Conversation

gonengazit
Copy link

added missing symbols that pico8 doesn't count as tokens, and added special handling for unary operators.
token counting is actually almost 100% accurate after these fixes, bar some niche edge cases.

@scottnm
Copy link

scottnm commented Jun 2, 2022

love this change! hope the maintainer accepts it when they have the time :)
In the meantime, I merged this into my own fork and noticed that after your fix one of the tests is broken in tests/pico8/lua/count_test.py

Here's the patch in case you want it but you case also work through it yourself by running the tests with pytest

diff --git a/tests/pico8/lua/count_test.py b/tests/pico8/lua/count_test.py
index da04435..d5d9a4b 100644
--- a/tests/pico8/lua/count_test.py
+++ b/tests/pico8/lua/count_test.py
@@ -65,11 +65,11 @@ end
     {'code':'''for x=1,10,2 do
   abc = 123
 end
-''', 'tokens': 12, 'chars': 32},
+''', 'tokens': 10, 'chars': 32},
     {'code':'''for a,b,c in 1,2,3 do
   abc = 123
 end
-''', 'tokens': 16, 'chars': 38},
+''', 'tokens': 12, 'chars': 38},
     {'code':'''function f()
   return 999
 end
@@ -78,8 +78,8 @@ end
   return 999
 end
 ''', 'tokens': 5, 'chars': 36},
-    {'code':'local a,b,c\n', 'tokens': 5, 'chars': 12},
-    {'code':'local a,b,c = 1,2,3\n', 'tokens': 11, 'chars': 20},
+    {'code':'local a,b,c\n', 'tokens': 3, 'chars': 12},
+    {'code':'local a,b,c = 1,2,3\n', 'tokens': 7, 'chars': 20},
     {'code':'''function f.a.b()
   return 999
 end
@@ -95,10 +95,10 @@ b=false
 c=true
 ''', 'tokens': 9, 'chars': 21},
     {'code':'a = 123\n', 'tokens': 3, 'chars': 8},
-    {'code':'a = -123\n', 'tokens': 4, 'chars': 9},
+    {'code':'a = -123\n', 'tokens': 3, 'chars': 9},
     {'code':'a = 123.45\n', 'tokens': 3, 'chars': 11},
     {'code':'a = 123.45e2\n', 'tokens': 4, 'chars': 13},
-    {'code':'a = -123.45e2\n', 'tokens': 5, 'chars': 14},
+    {'code':'a = -123.45e2\n', 'tokens': 4, 'chars': 14},
     {'code':'a = \'string\'\n', 'tokens': 3, 'chars': 13},
     {'code':'a = "string"\n', 'tokens': 3, 'chars': 13},
     {'code':'function f(...)\nend\n', 'tokens': 4, 'chars': 20},
@@ -107,7 +107,7 @@ c=true
     {'code':'c = #a\n', 'tokens': 4, 'chars': 7},
     {'code':'c:m()\n', 'tokens': 3, 'chars': 6},
     {'code':'a = {}\n', 'tokens': 3, 'chars': 7},
-    {'code':'a = {[a]=3;b=4,999}\n', 'tokens': 13, 'chars': 20},
+    {'code':'a = {[a]=3;b=4,999}\n', 'tokens': 11, 'chars': 20},
     {'code':'print(a..b)\n', 'tokens': 5, 'chars': 12},
     {'code':'''goto label
 print('one')

scottnm added a commit to scottnm/picotool that referenced this pull request Jun 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants