hedgewars-draft: tools/pas2c/PascalParser.hs@00b1facf2805 (annotated)

4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	1	module PascalParser where
671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	2
6412 4b9a59116535 - Split PascalParser into modules unc0rr parents: 6399 diff changeset	3	import Text.Parsec
6272 a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	4	import Text.Parsec.Char
a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	5	import Text.Parsec.Token
a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	6	import Text.Parsec.Language
6412 4b9a59116535 - Split PascalParser into modules unc0rr parents: 6399 diff changeset	7	import Text.Parsec.Expr
6272 a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	8	import Text.Parsec.Prim
a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	9	import Text.Parsec.Combinator
a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	10	import Text.Parsec.String
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	11	import Control.Monad
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	12	import Data.Maybe
7067 f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	13	import Data.Char
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	14
6412 4b9a59116535 - Split PascalParser into modules unc0rr parents: 6399 diff changeset	15	import PascalBasics
6467 090269e528df - Improve parsing of prefix operators unc0rr parents: 6453 diff changeset	16	import PascalUnitSyntaxTree
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	17
6891 ab9843957664 Improve rendering of function types, ranges, and more unc0rr parents: 6875 diff changeset	18	knownTypes = ["shortstring", "ansistring", "char", "byte"]
6357 52cb4807a78c Something unc0rr parents: 6355 diff changeset	19
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	20	pascalUnit = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	21	comments
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	22	u <- choice [program, unit, systemUnit, redoUnit]
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	23	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	24	return u
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	25
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	26	iD = do
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	27	i <- liftM (flip Identifier BTUnknown) (identifier pas)
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	28	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	29	return i
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	30
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	31	unit = do
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	32	string "unit" >> comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	33	name <- iD
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	34	semi pas
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	35	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	36	int <- interface
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	37	impl <- implementation
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	38	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	39	return $ Unit name int impl Nothing Nothing
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	40
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	41
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	42	reference = buildExpressionParser table term <?> "reference"
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	43	where
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	44	term = comments >> choice [
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	45	parens pas (liftM RefExpression expression >>= postfixes) >>= postfixes
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	46	, try $ typeCast >>= postfixes
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	47	, char '@' >> liftM Address reference >>= postfixes
6386 7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	48	, liftM SimpleReference iD >>= postfixes
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	49	] <?> "simple reference"
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	50
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	51	table = [
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	52	]
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	53
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	54	postfixes r = many postfix >>= return . foldl (flip ($)) r
6386 7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	55	postfix = choice [
7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	56	parens pas (option [] parameters) >>= return . FunCall
7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	57	, char '^' >> return Dereference
7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	58	, (brackets pas) (commaSep1 pas $ expression) >>= return . ArrayElement
6467 090269e528df - Improve parsing of prefix operators unc0rr parents: 6453 diff changeset	59	, (char '.' >> notFollowedBy (char '.')) >> liftM (flip RecordField) reference
6386 7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 diff changeset	60	]
6316 ac23ba018ed2 Fix inifinite loops unc0rr parents: 6315 diff changeset	61
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	62	typeCast = do
14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	63	t <- choice $ map (\s -> try $ caseInsensitiveString s >>= \i -> notFollowedBy alphaNum >> return i) knownTypes
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	64	e <- parens pas expression
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	65	comments
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	66	return $ TypeCast (Identifier t BTUnknown) e
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	67
59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	68	varsDecl1 = varsParser sepEndBy1
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	69	varsDecl = varsParser sepEndBy
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	70	varsParser m endsWithSemi = do
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	71	vs <- m (aVarDecl endsWithSemi) (semi pas)
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	72	return vs
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	73
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	74	aVarDecl endsWithSemi = do
7317 3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	75	isVar <- liftM (== Just "var") $
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	76	if not endsWithSemi then
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	77	optionMaybe $ choice [
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	78	try $ string "var"
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	79	, try $ string "const"
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	80	, try $ string "out"
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	81	]
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	82	else
3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	83	return Nothing
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	84	comments
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	85	ids <- do
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	86	i <- (commaSep1 pas) $ (try iD <?> "variable declaration")
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	87	char ':'
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	88	return i
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	89	comments
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	90	t <- typeDecl <?> "variable type declaration"
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	91	comments
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	92	init <- option Nothing $ do
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	93	char '='
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	94	comments
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	95	e <- initExpression
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	96	comments
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	97	return (Just e)
7317 3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	98	return $ VarDeclaration isVar False (ids, t) init
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	99
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	100
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	101	constsDecl = do
6317 83b93a2d2741 Improve parsing of complex references like "a^[b[c], d]" unc0rr parents: 6316 diff changeset	102	vs <- many1 (try (aConstDecl >>= \i -> semi pas >> return i) >>= \i -> comments >> return i)
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	103	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	104	return vs
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	105	where
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	106	aConstDecl = do
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	107	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	108	i <- iD
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	109	t <- optionMaybe $ do
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	110	char ':'
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	111	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	112	t <- typeDecl
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	113	comments
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	114	return t
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	115	char '='
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	116	comments
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	117	e <- initExpression
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	118	comments
7317 3534a264b27a Prepare to handle passing by reference unc0rr parents: 7315 diff changeset	119	return $ VarDeclaration False (isNothing t) ([i], fromMaybe (DeriveType e) t) (Just e)
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	120
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	121	typeDecl = choice [
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	122	char '^' >> typeDecl >>= return . PointerTo
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	123	, try (string "shortstring") >> return (String 255)
a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	124	, try (string "string") >> optionMaybe (brackets pas $ integer pas) >>= return . String . fromMaybe 255
6891 ab9843957664 Improve rendering of function types, ranges, and more unc0rr parents: 6875 diff changeset	125	, try (string "ansistring") >> optionMaybe (brackets pas $ integer pas) >>= return . String . fromMaybe 255
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	126	, arrayDecl
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	127	, recordDecl
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	128	, setDecl
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	129	, functionType
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	130	, sequenceDecl >>= return . Sequence
6489 e1f0058cfedd Add base type tags to identifiers unc0rr parents: 6467 diff changeset	131	, try iD >>= return . SimpleType
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	132	, rangeDecl >>= return . RangeType
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	133	] <?> "type declaration"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	134	where
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	135	arrayDecl = do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	136	try $ do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	137	optional $ (try $ string "packed") >> comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	138	string "array"
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	139	comments
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	140	r <- option [] $ do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	141	char '['
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	142	r <- commaSep pas rangeDecl
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	143	char ']'
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	144	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	145	return r
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	146	string "of"
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	147	comments
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	148	t <- typeDecl
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	149	if null r then
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	150	return $ ArrayDecl Nothing t
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	151	else
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	152	return $ foldr (\a b -> ArrayDecl (Just a) b) (ArrayDecl (Just $ head r) t) (tail r)
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	153	recordDecl = do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	154	try $ do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	155	optional $ (try $ string "packed") >> comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	156	string "record"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	157	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	158	vs <- varsDecl True
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	159	union <- optionMaybe $ do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	160	string "case"
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	161	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	162	iD
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	163	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	164	string "of"
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	165	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	166	many unionCase
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	167	string "end"
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	168	return $ RecordType vs union
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	169	setDecl = do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	170	try $ string "set" >> space
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	171	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	172	string "of"
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	173	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	174	liftM Set typeDecl
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	175	unionCase = do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	176	try $ commaSep pas $ (iD >> return ()) <\|> (integer pas >> return ())
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	177	char ':'
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	178	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	179	u <- parens pas $ varsDecl True
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	180	char ';'
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	181	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	182	return u
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	183	sequenceDecl = (parens pas) $ (commaSep pas) (iD >>= \i -> optional (spaces >> char '=' >> spaces >> integer pas) >> return i)
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	184	functionType = do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	185	fp <- try (string "function") <\|> try (string "procedure")
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	186	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	187	vs <- option [] $ parens pas $ varsDecl False
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	188	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	189	ret <- if (fp == "function") then do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	190	char ':'
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	191	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	192	ret <- typeDecl
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	193	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	194	return ret
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	195	else
6826 8fadeefdd352 Just some further work unc0rr parents: 6626 diff changeset	196	return VoidType
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	197	optional $ try $ char ';' >> comments >> string "cdecl"
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	198	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	199	return $ FunctionType ret vs
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	200
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	201	typesDecl = many (aTypeDecl >>= \t -> comments >> return t)
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	202	where
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	203	aTypeDecl = do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	204	i <- try $ do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	205	i <- iD <?> "type declaration"
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	206	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	207	char '='
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	208	return i
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	209	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	210	t <- typeDecl
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	211	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	212	semi pas
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	213	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	214	return $ TypeDeclaration i t
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	215
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	216	rangeDecl = choice [
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	217	try $ rangeft
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	218	, iD >>= return . Range
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	219	] <?> "range declaration"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	220	where
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	221	rangeft = do
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	222	e1 <- initExpression
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	223	string ".."
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	224	e2 <- initExpression
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	225	return $ RangeFromTo e1 e2
59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	226
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	227	typeVarDeclaration isImpl = (liftM concat . many . choice) [
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	228	varSection,
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	229	constSection,
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	230	typeSection,
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	231	funcDecl,
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	232	operatorDecl
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	233	]
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	234	where
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	235
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	236	fixInit v = concat $ map (\x -> case x of
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	237	VarDeclaration a b (ids, t) c ->
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	238	let typeId = (Identifier ((\(Identifier i _) -> i) (head ids) ++ "_tt") BTUnknown) in
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	239	let res = [TypeDeclaration typeId t, VarDeclaration a b (ids, (SimpleType typeId)) c] in
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	240	case t of
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	241	RecordType _ _ -> res -- create a separated type declaration
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	242	ArrayDecl _ _ -> res
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	243	_ -> [x]
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	244	_ -> error ("checkInit:\n" ++ (show v))) v
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	245
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	246	varSection = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	247	try $ string "var"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	248	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	249	v <- varsDecl1 True <?> "variable declaration"
6272 a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	250	comments
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	251	return $ fixInit v
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	252
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	253	constSection = do
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	254	try $ string "const"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	255	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	256	c <- constsDecl <?> "const declaration"
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	257	comments
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	258	return $ fixInit c
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	259
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	260	typeSection = do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	261	try $ string "type"
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	262	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	263	t <- typesDecl <?> "type declaration"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	264	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	265	return t
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	266
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	267	operatorDecl = do
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	268	try $ string "operator"
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	269	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	270	i <- manyTill anyChar space
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	271	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	272	vs <- parens pas $ varsDecl False
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	273	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	274	rid <- iD
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	275	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	276	char ':'
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	277	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	278	ret <- typeDecl
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	279	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	280	return ret
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	281	char ';'
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	282	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	283	forward <- liftM isJust $ optionMaybe (try (string "forward;") >> comments)
7513 39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	284	inline <- liftM (any (== "inline;")) $ many functionDecorator
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	285	b <- if isImpl && (not forward) then
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	286	liftM Just functionBody
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	287	else
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	288	return Nothing
7513 39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	289	return $ [OperatorDeclaration i rid inline ret vs b]
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	290
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	291
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	292	funcDecl = do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	293	fp <- try (string "function") <\|> try (string "procedure")
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	294	comments
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	295	i <- iD
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	296	vs <- option [] $ parens pas $ varsDecl False
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	297	comments
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	298	ret <- if (fp == "function") then do
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	299	char ':'
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	300	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	301	ret <- typeDecl
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	302	comments
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	303	return ret
1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	304	else
6836 42382794b73f - Treat strings as arrays of chars unc0rr parents: 6826 diff changeset	305	return VoidType
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	306	char ';'
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	307	comments
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	308	forward <- liftM isJust $ optionMaybe (try (string "forward;") >> comments)
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	309	decorators <- many functionDecorator
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	310	let inline = any (== "inline;") decorators
00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	311	overload = any (== "overload;") decorators
6417 eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	312	b <- if isImpl && (not forward) then
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	313	liftM Just functionBody
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	314	else
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	315	return Nothing
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	316	return $ [FunctionDeclaration i inline overload ret vs b]
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	317
7513 39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	318	functionDecorator = do
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	319	d <- choice [
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	320	try $ string "inline;"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	321	, try $ caseInsensitiveString "cdecl;"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	322	, try $ string "overload;"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	323	, try $ string "export;"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	324	, try $ string "varargs;"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	325	, try (string "external") >> comments >> iD >> optional (string "name" >> comments >> stringLiteral pas)>> string ";"
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	326	]
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	327	comments
39866eb9e4a6 Keep inlining unc0rr parents: 7429 diff changeset	328	return d
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	329
59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	330
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	331	program = do
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	332	string "program"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	333	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	334	name <- iD
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	335	(char ';')
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	336	comments
6417 eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	337	comments
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	338	u <- uses
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	339	comments
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	340	tv <- typeVarDeclaration True
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	341	comments
6417 eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	342	p <- phrase
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	343	comments
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	344	char '.'
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	345	comments
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	346	return $ Program name (Implementation u (TypesAndVars tv)) p
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	347
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	348	interface = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	349	string "interface"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	350	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	351	u <- uses
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	352	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	353	tv <- typeVarDeclaration False
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	354	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	355	return $ Interface u (TypesAndVars tv)
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	356
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	357	implementation = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	358	string "implementation"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	359	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	360	u <- uses
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	361	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	362	tv <- typeVarDeclaration True
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	363	string "end."
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	364	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	365	return $ Implementation u (TypesAndVars tv)
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	366
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	367	expression = do
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	368	buildExpressionParser table term <?> "expression"
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	369	where
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	370	term = comments >> choice [
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	371	builtInFunction expression >>= \(n, e) -> return $ BuiltInFunCall e (SimpleReference (Identifier n BTUnknown))
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	372	, try (parens pas $ expression >>= \e -> notFollowedBy (comments >> char '.') >> return e)
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	373	, brackets pas (commaSep pas iD) >>= return . SetExpression
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	374	, try $ integer pas >>= \i -> notFollowedBy (char '.') >> (return . NumberLiteral . show) i
6452 7c6f9b6672dc More work on the parser unc0rr parents: 6450 diff changeset	375	, float pas >>= return . FloatLiteral . show
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	376	, try $ integer pas >>= return . NumberLiteral . show
7067 f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	377	, try (string "_S" >> stringLiteral pas) >>= return . StringLiteral
7070 8d4189609e90 oops, wrong type unc0rr parents: 7069 diff changeset	378	, try (string "_P" >> stringLiteral pas) >>= return . PCharLiteral
7067 f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	379	, stringLiteral pas >>= return . strOrChar
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	380	, try (string "#$") >> many hexDigit >>= \c -> comments >> return (HexCharCode c)
6417 eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	381	, char '#' >> many digit >>= \c -> comments >> return (CharCode c)
eae5900fd8a4 Improve parser a bit, preparation to parsing whole program at once and compiling it into single C file unc0rr parents: 6414 diff changeset	382	, char '$' >> many hexDigit >>= \h -> comments >> return (HexNumber h)
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	383	--, char '-' >> expression >>= return . PrefixOp "-"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	384	, char '-' >> reference >>= return . PrefixOp "-" . Reference
7762 d2fd8040534f Better error handling unc0rr parents: 7690 diff changeset	385	, (try $ string "not" >> notFollowedBy comments) >> unexpected "'not'"
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	386	, try $ string "nil" >> return Null
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	387	, reference >>= return . Reference
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	388	] <?> "simple expression"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	389
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	390	table = [
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	391	[ Prefix (reservedOp pas "not">> return (PrefixOp "not"))
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	392	, Prefix (try (char '-') >> return (PrefixOp "-"))]
8020 00b1facf2805 merge xymeng pas2c koda parents: 7969 diff changeset	393	,
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	394	[ Infix (char '' >> return (BinOp "")) AssocLeft
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	395	, Infix (char '/' >> return (BinOp "/")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	396	, Infix (try (string "div") >> return (BinOp "div")) AssocLeft
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	397	, Infix (try (string "mod") >> return (BinOp "mod")) AssocLeft
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	398	, Infix (try (string "in") >> return (BinOp "in")) AssocNone
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	399	, Infix (try $ string "and" >> return (BinOp "and")) AssocLeft
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	400	, Infix (try $ string "shl" >> return (BinOp "shl")) AssocLeft
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	401	, Infix (try $ string "shr" >> return (BinOp "shr")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	402	]
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	403	, [ Infix (char '+' >> return (BinOp "+")) AssocLeft
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	404	, Infix (char '-' >> return (BinOp "-")) AssocLeft
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	405	, Infix (try $ string "or" >> return (BinOp "or")) AssocLeft
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	406	, Infix (try $ string "xor" >> return (BinOp "xor")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	407	]
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	408	, [ Infix (try (string "<>") >> return (BinOp "<>")) AssocNone
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	409	, Infix (try (string "<=") >> return (BinOp "<=")) AssocNone
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	410	, Infix (try (string ">=") >> return (BinOp ">=")) AssocNone
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	411	, Infix (char '<' >> return (BinOp "<")) AssocNone
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	412	, Infix (char '>' >> return (BinOp ">")) AssocNone
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	413	]
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	414	{-, [ Infix (try $ string "shl" >> return (BinOp "shl")) AssocNone
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	415	, Infix (try $ string "shr" >> return (BinOp "shr")) AssocNone
7043 7c080e5ac8d0 Some work to make more units compile after conversion to c unc0rr parents: 6897 diff changeset	416	]
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	417	, [
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	418	Infix (try $ string "or" >> return (BinOp "or")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	419	, Infix (try $ string "xor" >> return (BinOp "xor")) AssocLeft
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	420	]-}
7069 bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	421	, [
bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	422	Infix (char '=' >> return (BinOp "=")) AssocNone
bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	423	]
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	424	]
7067 f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	425	strOrChar [a] = CharCode . show . ord $ a
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	426	strOrChar a = StringLiteral a
59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	427
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	428	phrasesBlock = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	429	try $ string "begin"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	430	comments
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	431	p <- manyTill phrase (try $ string "end" >> notFollowedBy alphaNum)
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	432	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	433	return $ Phrases p
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	434
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	435	phrase = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	436	o <- choice [
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	437	phrasesBlock
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	438	, ifBlock
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	439	, whileCycle
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	440	, repeatCycle
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	441	, switchCase
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	442	, withBlock
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	443	, forCycle
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	444	, (try $ reference >>= \r -> string ":=" >> return r) >>= \r -> comments >> expression >>= return . Assignment r
6895 31def088a870 Many small improvements to pas2c unc0rr parents: 6891 diff changeset	445	, builtInFunction expression >>= \(n, e) -> return $ BuiltInFunctionCall e (SimpleReference (Identifier n BTUnknown))
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	446	, procCall
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	447	, char ';' >> comments >> return NOP
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	448	]
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	449	optional $ char ';'
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	450	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	451	return o
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	452
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	453	ifBlock = do
7642 91fce82f9c6f fix parsing of 'if': identifiers can also contain underscores sheepluva parents: 7641 diff changeset	454	try $ string "if" >> notFollowedBy (alphaNum <\|> char '_')
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	455	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	456	e <- expression
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	457	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	458	string "then"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	459	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	460	o1 <- phrase
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	461	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	462	o2 <- optionMaybe $ do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	463	try $ string "else" >> space
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	464	comments
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	465	o <- option NOP phrase
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	466	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	467	return o
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	468	return $ IfThenElse e o1 o2
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	469
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	470	whileCycle = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	471	try $ string "while"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	472	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	473	e <- expression
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	474	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	475	string "do"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	476	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	477	o <- phrase
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	478	return $ WhileCycle e o
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	479
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	480	withBlock = do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	481	try $ string "with" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	482	comments
6387 3dcb839b5904 Less code unc0rr parents: 6386 diff changeset	483	rs <- (commaSep1 pas) reference
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	484	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	485	string "do"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	486	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	487	o <- phrase
6387 3dcb839b5904 Less code unc0rr parents: 6386 diff changeset	488	return $ foldr WithBlock o rs
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	489
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	490	repeatCycle = do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	491	try $ string "repeat" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	492	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	493	o <- many phrase
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	494	string "until"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	495	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	496	e <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	497	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	498	return $ RepeatCycle e o
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	499
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	500	forCycle = do
6425 1ef4192aa80d - Parse unions, sets, function type, packed arrays and some more imporvements to the parser. Now it parses uVariable, uConsts and even SDLh.pas unc0rr parents: 6417 diff changeset	501	try $ string "for" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	502	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	503	i <- iD
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	504	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	505	string ":="
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	506	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	507	e1 <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	508	comments
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	509	up <- liftM (== Just "to") $
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	510	optionMaybe $ choice [
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	511	try $ string "to"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	512	, try $ string "downto"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	513	]
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	514	--choice [string "to", string "downto"]
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	515	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	516	e2 <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	517	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	518	string "do"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	519	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	520	p <- phrase
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	521	comments
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	522	return $ ForCycle i e1 e2 p up
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	523
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	524	switchCase = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	525	try $ string "case"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	526	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	527	e <- expression
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	528	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	529	string "of"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	530	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	531	cs <- many1 aCase
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	532	o2 <- optionMaybe $ do
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	533	try $ string "else" >> notFollowedBy alphaNum
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	534	comments
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	535	o <- many phrase
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	536	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	537	return o
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	538	string "end"
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	539	comments
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	540	return $ SwitchCase e cs o2
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	541	where
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	542	aCase = do
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	543	e <- (commaSep pas) $ (liftM InitRange rangeDecl <\|> initExpression)
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	544	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	545	char ':'
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	546	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	547	p <- phrase
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	548	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	549	return (e, p)
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	550
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	551	procCall = do
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	552	r <- reference
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	553	p <- option [] $ (parens pas) parameters
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	554	return $ ProcCall r p
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	555
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	556	parameters = (commaSep pas) expression <?> "parameters"
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	557
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	558	functionBody = do
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	559	tv <- typeVarDeclaration True
a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	560	comments
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	561	p <- phrasesBlock
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	562	char ';'
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	563	comments
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	564	return (TypesAndVars tv, p)
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	565
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	566	uses = liftM Uses (option [] u)
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	567	where
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	568	u = do
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	569	string "uses"
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	570	comments
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	571	u <- (iD >>= \i -> comments >> return i) `sepBy1` (char ',' >> comments)
6270 0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	572	char ';'
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	573	comments
0a99f73dd8dd Improve pascal parser, now it is able to successfully parse uGame.pas (though it eats all comments). Many things are still missing. Well, it's just a matter of time to implement the rest. All basic work is already done anyway. unc0rr parents: 4353 diff changeset	574	return u
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	575
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	576	initExpression = buildExpressionParser table term <?> "initialization expression"
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	577	where
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	578	term = comments >> choice [
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	579	liftM (uncurry BuiltInFunction) $ builtInFunction initExpression
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	580	, try $ brackets pas (commaSep pas $ initExpression) >>= return . InitSet
7690 6ef121a80cb0 Treat init expression in parens as just expression instead of array initializer when there's only one entry in expressions list unc0rr parents: 7642 diff changeset	581	, try $ parens pas (commaSep pas $ initExpression) >>= \ia -> when (null $ tail ia) mzero >> return (InitArray ia)
6ef121a80cb0 Treat init expression in parens as just expression instead of array initializer when there's only one entry in expressions list unc0rr parents: 7642 diff changeset	582	, try $ parens pas (sepEndBy recField (char ';' >> comments)) >>= return . InitRecord
6ef121a80cb0 Treat init expression in parens as just expression instead of array initializer when there's only one entry in expressions list unc0rr parents: 7642 diff changeset	583	, parens pas initExpression
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	584	, try $ integer pas >>= \i -> notFollowedBy (char '.') >> (return . InitNumber . show) i
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	585	, try $ float pas >>= return . InitFloat . show
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	586	, try $ integer pas >>= return . InitNumber . show
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	587	, stringLiteral pas >>= return . InitString
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	588	, char '#' >> many digit >>= \c -> comments >> return (InitChar c)
eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	589	, char '$' >> many hexDigit >>= \h -> comments >> return (InitHexNumber h)
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	590	, char '@' >> initExpression >>= \c -> comments >> return (InitAddress c)
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	591	, try $ string "nil" >> return InitNull
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	592	, itypeCast
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	593	, iD >>= return . InitReference
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	594	]
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	595
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	596	recField = do
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	597	i <- iD
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	598	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	599	char ':'
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	600	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	601	e <- initExpression
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	602	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	603	return (i ,e)
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	604
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	605	table = [
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	606	[
12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	607	Prefix (char '-' >> return (InitPrefixOp "-"))
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	608	,Prefix (try (string "not") >> return (InitPrefixOp "not"))
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	609	]
12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	610	, [ Infix (char '' >> return (InitBinOp "")) AssocLeft
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	611	, Infix (char '/' >> return (InitBinOp "/")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	612	, Infix (try (string "div") >> return (InitBinOp "div")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	613	, Infix (try (string "mod") >> return (InitBinOp "mod")) AssocLeft
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	614	, Infix (try $ string "and" >> return (InitBinOp "and")) AssocLeft
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	615	, Infix (try $ string "shl" >> return (InitBinOp "shl")) AssocNone
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	616	, Infix (try $ string "shr" >> return (InitBinOp "shr")) AssocNone
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	617	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	618	, [ Infix (char '+' >> return (InitBinOp "+")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	619	, Infix (char '-' >> return (InitBinOp "-")) AssocLeft
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	620	, Infix (try $ string "or" >> return (InitBinOp "or")) AssocLeft
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	621	, Infix (try $ string "xor" >> return (InitBinOp "xor")) AssocLeft
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	622	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	623	, [ Infix (try (string "<>") >> return (InitBinOp "<>")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	624	, Infix (try (string "<=") >> return (InitBinOp "<=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	625	, Infix (try (string ">=") >> return (InitBinOp ">=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	626	, Infix (char '<' >> return (InitBinOp "<")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	627	, Infix (char '>' >> return (InitBinOp ">")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	628	, Infix (char '=' >> return (InitBinOp "=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	629	]
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	630	{--, [ Infix (try $ string "and" >> return (InitBinOp "and")) AssocLeft
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	631	, Infix (try $ string "or" >> return (InitBinOp "or")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	632	, Infix (try $ string "xor" >> return (InitBinOp "xor")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	633	]
6858 608c8b057c3b Improve rendering into C unc0rr parents: 6836 diff changeset	634	, [ Infix (try $ string "shl" >> return (InitBinOp "shl")) AssocNone
608c8b057c3b Improve rendering into C unc0rr parents: 6836 diff changeset	635	, Infix (try $ string "shr" >> return (InitBinOp "shr")) AssocNone
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	636	]--}
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	637	--, [Prefix (try (string "not") >> return (InitPrefixOp "not"))]
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	638	]
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	639
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	640	itypeCast = do
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	641	t <- choice $ map (\s -> try $ caseInsensitiveString s >>= \i -> notFollowedBy alphaNum >> return i) knownTypes
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	642	i <- parens pas initExpression
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	643	comments
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	644	return $ InitTypeCast (Identifier t BTUnknown) i
7315 59b5b19e6604 Remove trailing spaces unc0rr parents: 7070 diff changeset	645
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	646	builtInFunction e = do
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	647	name <- choice $ map (\s -> try $ caseInsensitiveString s >>= \i -> notFollowedBy alphaNum >> return i) builtin
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	648	spaces
6897 a9126661f613 Fix parsing of exit() call without parameters unc0rr parents: 6895 diff changeset	649	exprs <- option [] $ parens pas $ option [] $ commaSep1 pas $ e
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	650	spaces
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	651	return (name, exprs)
6512 0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	652
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	653	systemUnit = do
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	654	string "system;"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	655	comments
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	656	string "type"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	657	comments
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	658	t <- typesDecl
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	659	string "var"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	660	v <- varsDecl True
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	661	return $ System (t ++ v)
7429 fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	662
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	663	redoUnit = do
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	664	string "redo;"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	665	comments
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	666	string "type"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	667	comments
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	668	t <- typesDecl
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	669	string "var"
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	670	v <- varsDecl True
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	671	return $ Redo (t ++ v)
fcf13e40d6b6 Changes to pas2c - unreviewed apart from cursory glance and compile test. xymeng parents: 7317 diff changeset	672

author	koda
	Sun, 11 Nov 2012 16:44:40 +0100
branch	webgl
changeset 8020	00b1facf2805
parent 7969	7fcbbd46704a
child 8444	75db7bb8dce8
permissions	-rw-r--r--