removed typed-var (var<T>) support (use cast!)

README.md

@@ -27,7 +27,7 @@ The Sol compiler is written in Sol.
 	use{foo: 42, bar: "fortytwo"}
 
 	typedef Option = "A" or "B" or "C"
-	var<Option> x = "B"
+	var x = "B" : Option
 
 
 	-- Stuff the compiler catches:
@@ -64,7 +64,7 @@ Based on MetaLua. Cumbersome syntax:
 
 Compard to Sol:
 
-	var<number> n = 42
+	var n = 42 : number
 
 ### [Lua analyzer](https://bitbucket.org/kevinclancy/love-studio/wiki/OptionalTypeSystem)
 

build/class.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/class.sol on 2013 Oct 05  08:47:55 --]]  function sol_class(klass_name, super_name)
+--[[ DO NOT MODIFY - COMPILED FROM sol/class.sol on 2013 Oct 05  08:59:03 --]]  function sol_class(klass_name, super_name)
 	assert(klass_name, "You must specify a class name") --[[SOL OUTPUT--]] 
 
 	if super_name ~= nil then

build/edit_distance.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/edit_distance.sol on 2013 Oct 05  08:47:55 --]] -- From  http://nayruden.com/?p=115  -  https://gist.github.com/Nayruden/427389
+--[[ DO NOT MODIFY - COMPILED FROM sol/edit_distance.sol on 2013 Oct 05  08:59:03 --]] -- From  http://nayruden.com/?p=115  -  https://gist.github.com/Nayruden/427389
 -- Translated to Sol by Emil Ernerfeldt in 2013
 --[[
 	Function: EditDistance

build/lexer.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/lexer.sol on 2013 Oct 05  08:47:55 --]] local U = require 'util' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/lexer.sol on 2013 Oct 05  08:59:03 --]] local U = require 'util' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local set = U.set --[[SOL OUTPUT--]] 
 

build/lua_intrinsics.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/lua_intrinsics.sol on 2013 Oct 05  08:47:55 --]] local INTRINSICS = [[
+--[[ DO NOT MODIFY - COMPILED FROM sol/lua_intrinsics.sol on 2013 Oct 05  08:59:04 --]] local INTRINSICS = [[
 	global unpack = extern : function(t: [any]) -> ...
 
 	global coroutine = {

build/output.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/output.sol on 2013 Oct 05  08:47:55 --]] require 'parser' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/output.sol on 2013 Oct 05  08:59:04 --]] require 'parser' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local U = require 'util' --[[SOL OUTPUT--]] 
 local printf_err = U.printf_err --[[SOL OUTPUT--]] 

build/parser.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/parser.sol on 2013 Oct 05  08:47:55 --]] --
+--[[ DO NOT MODIFY - COMPILED FROM sol/parser.sol on 2013 Oct 05  08:59:04 --]] --
 -- parse_sol.lua
 -- parse_sol taken in a token stream (from the lexer)
 -- and outputs an AST.
@@ -1404,11 +1404,14 @@ local is_mem_fun = (type == 'mem_fun') --[[SOL OUTPUT--]]
 		local where = where_am_i() --[[SOL OUTPUT--]] 
 		local types = nil --[[SOL OUTPUT--]] 
 
+		--[[
+		--parse var<type>
 		if scoping == 'var' then
-			types = parse_type_args(scope) --[[SOL OUTPUT--]] 
+			types = parse_type_args(scope)
 		elseif parse_type_args(scope) then
-			return false, report_error("%s cannot have type list - did you want 'var' ?") --[[SOL OUTPUT--]] 
-		end --[[SOL OUTPUT--]] 
+			return false, report_error("%s cannot have type list - did you want 'var' ?")
+		end
+		--]]
 
 		if types and #types == 0 then
 			return false, report_error("Empty type list") --[[SOL OUTPUT--]] 

build/scope.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/scope.sol on 2013 Oct 05  08:47:55 --]] local T = require 'type' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/scope.sol on 2013 Oct 05  08:59:04 --]] local T = require 'type' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local U = require 'util' --[[SOL OUTPUT--]] 
 

build/sol.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/sol.sol on 2013 Oct 05  08:47:55 --]] -- For running a .sol without outputting a .lua to disk
+--[[ DO NOT MODIFY - COMPILED FROM sol/sol.sol on 2013 Oct 05  08:59:04 --]] -- For running a .sol without outputting a .lua to disk
 -- TODO: compiler.sol continaing thing common to sol.sol and solc.sol
 
 local lfs  = require 'lfs' --[[SOL OUTPUT--]] 

build/sol_debug.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/sol_debug.sol on 2013 Oct 05  08:47:55 --]] local D = {} --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/sol_debug.sol on 2013 Oct 05  08:59:04 --]] local D = {} --[[SOL OUTPUT--]] 
 
 D.active = false --[[SOL OUTPUT--]] 
 

build/solc.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/solc.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/solc.sol on 2013 Oct 05  08:59:04 --]] --[[
 Command line compiler.
 
 Compiles .sol to .lua, or prints out an error

build/type.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/type.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/type.sol on 2013 Oct 05  08:59:04 --]] --[[
 A type can either be a particular value (number or string) or one of the following.
 --]]
 

build/type_check.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/type_check.sol on 2013 Oct 05  08:47:55 --]] local U   = require 'util' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/type_check.sol on 2013 Oct 05  08:59:04 --]] local U   = require 'util' --[[SOL OUTPUT--]] 
 local set = U.set --[[SOL OUTPUT--]] 
 local T   = require 'type' --[[SOL OUTPUT--]] 
 local P   = require 'parser' --[[SOL OUTPUT--]] 
@@ -45,7 +45,7 @@ local function loose_lookup(table, id)
 
 	local edit_distance = require 'edit_distance' --[[SOL OUTPUT--]] 
 
-	local  closest_dist = math.huge --[[SOL OUTPUT--]] 
+	local closest_dist = math.huge --[[SOL OUTPUT--]] 
 	local closest_key  = nil --[[SOL OUTPUT--]] 
 
 	for k,_ in pairs(table) do

build/util.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/util.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/util.sol on 2013 Oct 05  08:59:04 --]] --[[
 Util.lua
 
 Provides some common utilities shared throughout the project.

demo.lua

@@ -134,7 +134,7 @@ local ok
 
 
 = 'yes'
---var<Tribool> bad = 'wrong'
+--var bad = 'wrong' : Tribool
 
 local function do_stuff(how)
 

demo.sol

@@ -116,9 +116,9 @@ local win, err_msg, too_many = win_or_fail()
 -----------------------------------------------------
 -- var vs local
 
-local     local_can_be_anything = require 'unfindable'
-var       var_must_be_deducible = some_lua_function()
-var<int>  var_can_be_explicit   = require 'unfindable'
+local local_can_be_anything = require 'unfindable'
+var   var_must_be_deducible = some_lua_function()
+var   var_can_be_explicit   = (require 'unfindable') : int
 
 
 
@@ -131,7 +131,7 @@ do
 	list[2] = '1337'
 
 	typedef Int2str = {int => string} 
-	var<Int2str> map = {}
+	var map = {} : Int2str
 	map[1] = 'one'
 	map[2] = 'two'
 	map['three'] = 3
@@ -144,8 +144,8 @@ end
 
 typedef Tribool = 'yes' or 'no' or 'maybe'
 
-var<Tribool> ok  = 'yes'
-var<Tribool> bad = 'wrong'
+var ok  = 'yes'   : Tribool
+var bad = 'wrong' : Tribool
 
 local function do_stuff(how: "quickly" or "slowly")
 
@@ -195,7 +195,7 @@ typedef BarNode : Node = {
 
 local function work_on_node(n: Node)
 	if n.tag == 'Foo' then
-		var<FooNode> f = n
+		var f = n : FooNode
 	end
 
 	var<[string]> a = n.wild

headers/edit_distance.sol

@@ -1,3 +1,3 @@
--- Compiled from sol/edit_distance.sol on 2013 Oct 05  08:47:53
+-- Compiled from sol/edit_distance.sol on 2013 Oct 05  08:59:02
 
 return function(s: string or [int], t: string or [int], lim: int?) -> int

headers/lexer.sol

@@ -1,4 +1,4 @@
--- Compiled from sol/lexer.sol on 2013 Oct 05  08:47:53
+-- Compiled from sol/lexer.sol on 2013 Oct 05  08:59:02
 
 return {
 	-- Types:

headers/lua_intrinsics.sol

@@ -1,3 +1,3 @@
--- Compiled from sol/lua_intrinsics.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/lua_intrinsics.sol on 2013 Oct 05  08:59:02
 
 return { add_intrinsics_to_global_scope: function() -> void; }

headers/output.sol

@@ -1,3 +1,3 @@
--- Compiled from sol/output.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/output.sol on 2013 Oct 05  08:59:02
 
 return function(ast, filename: string, strip_white_space: bool?) -> string

headers/parser.sol

@@ -1,4 +1,4 @@
--- Compiled from sol/parser.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/parser.sol on 2013 Oct 05  08:59:02
 
 return {
 	-- Types:

headers/scope.sol

@@ -1,3 +1,3 @@
--- Compiled from sol/scope.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/scope.sol on 2013 Oct 05  08:59:02
 
 return table

headers/sol_debug.sol

@@ -1,4 +1,4 @@
--- Compiled from sol/sol_debug.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/sol_debug.sol on 2013 Oct 05  08:59:02
 
 return {
 	activate: function() -> void;

headers/type.sol

@@ -1,4 +1,4 @@
--- Compiled from sol/type.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/type.sol on 2013 Oct 05  08:59:02
 
 return {
 	-- Types:

headers/type_check.sol

@@ -1,3 +1,3 @@
--- Compiled from sol/type_check.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/type_check.sol on 2013 Oct 05  08:59:02
 
 return function(ast, filename: string, on_require: OnRequireT?, settings) -> true or false, any

headers/util.sol

@@ -1,4 +1,4 @@
--- Compiled from sol/util.sol on 2013 Oct 05  08:47:54
+-- Compiled from sol/util.sol on 2013 Oct 05  08:59:02
 
 return {
 	INDENTATION:       "\9";

install/class.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/class.sol on 2013 Oct 05  08:47:55 --]]  function sol_class(klass_name, super_name)
+--[[ DO NOT MODIFY - COMPILED FROM sol/class.sol on 2013 Oct 05  08:59:03 --]]  function sol_class(klass_name, super_name)
 	assert(klass_name, "You must specify a class name") --[[SOL OUTPUT--]] 
 
 	if super_name ~= nil then

install/edit_distance.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/edit_distance.sol on 2013 Oct 05  08:47:55 --]] -- From  http://nayruden.com/?p=115  -  https://gist.github.com/Nayruden/427389
+--[[ DO NOT MODIFY - COMPILED FROM sol/edit_distance.sol on 2013 Oct 05  08:59:03 --]] -- From  http://nayruden.com/?p=115  -  https://gist.github.com/Nayruden/427389
 -- Translated to Sol by Emil Ernerfeldt in 2013
 --[[
 	Function: EditDistance

install/lexer.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/lexer.sol on 2013 Oct 05  08:47:55 --]] local U = require 'util' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/lexer.sol on 2013 Oct 05  08:59:03 --]] local U = require 'util' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local set = U.set --[[SOL OUTPUT--]] 
 

install/lua_intrinsics.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/lua_intrinsics.sol on 2013 Oct 05  08:47:55 --]] local INTRINSICS = [[
+--[[ DO NOT MODIFY - COMPILED FROM sol/lua_intrinsics.sol on 2013 Oct 05  08:59:04 --]] local INTRINSICS = [[
 	global unpack = extern : function(t: [any]) -> ...
 
 	global coroutine = {

install/output.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/output.sol on 2013 Oct 05  08:47:55 --]] require 'parser' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/output.sol on 2013 Oct 05  08:59:04 --]] require 'parser' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local U = require 'util' --[[SOL OUTPUT--]] 
 local printf_err = U.printf_err --[[SOL OUTPUT--]] 

install/parser.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/parser.sol on 2013 Oct 05  08:47:55 --]] --
+--[[ DO NOT MODIFY - COMPILED FROM sol/parser.sol on 2013 Oct 05  08:59:04 --]] --
 -- parse_sol.lua
 -- parse_sol taken in a token stream (from the lexer)
 -- and outputs an AST.
@@ -1404,11 +1404,14 @@ local is_mem_fun = (type == 'mem_fun') --[[SOL OUTPUT--]]
 		local where = where_am_i() --[[SOL OUTPUT--]] 
 		local types = nil --[[SOL OUTPUT--]] 
 
+		--[[
+		--parse var<type>
 		if scoping == 'var' then
-			types = parse_type_args(scope) --[[SOL OUTPUT--]] 
+			types = parse_type_args(scope)
 		elseif parse_type_args(scope) then
-			return false, report_error("%s cannot have type list - did you want 'var' ?") --[[SOL OUTPUT--]] 
-		end --[[SOL OUTPUT--]] 
+			return false, report_error("%s cannot have type list - did you want 'var' ?")
+		end
+		--]]
 
 		if types and #types == 0 then
 			return false, report_error("Empty type list") --[[SOL OUTPUT--]] 

install/scope.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/scope.sol on 2013 Oct 05  08:47:55 --]] local T = require 'type' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/scope.sol on 2013 Oct 05  08:59:04 --]] local T = require 'type' --[[SOL OUTPUT--]] 
 local D = require 'sol_debug' --[[SOL OUTPUT--]] 
 local U = require 'util' --[[SOL OUTPUT--]] 
 

install/sol.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/sol.sol on 2013 Oct 05  08:47:55 --]] -- For running a .sol without outputting a .lua to disk
+--[[ DO NOT MODIFY - COMPILED FROM sol/sol.sol on 2013 Oct 05  08:59:04 --]] -- For running a .sol without outputting a .lua to disk
 -- TODO: compiler.sol continaing thing common to sol.sol and solc.sol
 
 local lfs  = require 'lfs' --[[SOL OUTPUT--]] 

install/sol_debug.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/sol_debug.sol on 2013 Oct 05  08:47:55 --]] local D = {} --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/sol_debug.sol on 2013 Oct 05  08:59:04 --]] local D = {} --[[SOL OUTPUT--]] 
 
 D.active = false --[[SOL OUTPUT--]] 
 

install/solc.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/solc.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/solc.sol on 2013 Oct 05  08:59:04 --]] --[[
 Command line compiler.
 
 Compiles .sol to .lua, or prints out an error

install/type.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/type.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/type.sol on 2013 Oct 05  08:59:04 --]] --[[
 A type can either be a particular value (number or string) or one of the following.
 --]]
 

install/type_check.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/type_check.sol on 2013 Oct 05  08:47:55 --]] local U   = require 'util' --[[SOL OUTPUT--]] 
+--[[ DO NOT MODIFY - COMPILED FROM sol/type_check.sol on 2013 Oct 05  08:59:04 --]] local U   = require 'util' --[[SOL OUTPUT--]] 
 local set = U.set --[[SOL OUTPUT--]] 
 local T   = require 'type' --[[SOL OUTPUT--]] 
 local P   = require 'parser' --[[SOL OUTPUT--]] 
@@ -45,7 +45,7 @@ local function loose_lookup(table, id)
 
 	local edit_distance = require 'edit_distance' --[[SOL OUTPUT--]] 
 
-	local  closest_dist = math.huge --[[SOL OUTPUT--]] 
+	local closest_dist = math.huge --[[SOL OUTPUT--]] 
 	local closest_key  = nil --[[SOL OUTPUT--]] 
 
 	for k,_ in pairs(table) do

install/util.lua

@@ -1,4 +1,4 @@
---[[ DO NOT MODIFY - COMPILED FROM sol/util.sol on 2013 Oct 05  08:47:55 --]] --[[
+--[[ DO NOT MODIFY - COMPILED FROM sol/util.sol on 2013 Oct 05  08:59:04 --]] --[[
 Util.lua
 
 Provides some common utilities shared throughout the project.

sol/edit_distance.sol

@@ -63,7 +63,7 @@ local function edit_distance( s: string or [int], t: string or [int], lim: int?
 		t = { string.byte( t, 1, t_len ) }
 	end
 
-	var< function(...:int)->int > min = math.min -- Localize for performance
+	var min = math.min : function(...:int)->int -- Localize for performance
 	var num_columns = t_len + 1 -- We use this a lot
 
 	var d = {} : [int] -- (s_len+1) * (t_len+1) is going to be the size of this array

sol/parser.sol

@@ -504,7 +504,7 @@ function P.parse_sol(src: string, tok, filename: string?, settings, module_scope
 					end
 				end
 			elseif tok:consume_symbol('...', token_list) then
-				var<T.Type?> elem_type = T.Any
+				var elem_type = T.Any
 
 				if settings.function_types and tok:consume_symbol(':') then
 					elem_type = parse_type(func_scope)
@@ -1060,7 +1060,7 @@ function P.parse_sol(src: string, tok, filename: string?, settings, module_scope
 			if not tok:consume_symbol(')') then
 				while true do
 					if tok:consume_symbol('...') then
-						var<T.Type> var_arg_t = T.Any
+						var var_arg_t = T.Any
 
 						if tok:consume_symbol(':') then
 							var_arg_t = parse_type(scope)
@@ -1404,11 +1404,14 @@ function P.parse_sol(src: string, tok, filename: string?, settings, module_scope
 		var where = where_am_i()
 		var types = nil : T.Typelist?
 
+		--[[
+		--parse var<type>
 		if scoping == 'var' then
 			types = parse_type_args(scope)
 		elseif parse_type_args(scope) then
 			return false, report_error("%s cannot have type list - did you want 'var' ?")
 		end
+		--]]
 
 		if types and #types == 0 then
 			return false, report_error("Empty type list")