hedgewars: tools/PascalParser.hs@9fe1c4091dd1 (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
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 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
6512 0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	22	u <- choice [program, unit, systemUnit]
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
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 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
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	41
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
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	51	table = [
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	52	]
6386 7d7703b26bda Prefix followed by prefix issue solved. Also some slight improvements. unc0rr parents: 6357 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
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	67
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	68
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	69	varsDecl1 = varsParser sepEndBy1
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	70	varsDecl = varsParser sepEndBy
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	71	varsParser m endsWithSemi = do
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	72	vs <- m (aVarDecl endsWithSemi) (semi pas)
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	73	return vs
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	74
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	75	aVarDecl endsWithSemi = 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	76	unless endsWithSemi $
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	77	optional $ choice [
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	78	try $ string "var"
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	79	, try $ string "const"
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	80	, try $ string "out"
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	81	]
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	82	comments
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	83	ids <- do
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	84	i <- (commaSep1 pas) $ (try iD <?> "variable declaration")
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	85	char ':'
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	86	return i
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	87	comments
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	88	t <- typeDecl <?> "variable type declaration"
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	init <- option Nothing $ do
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	91	char '='
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	92	comments
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	93	e <- initExpression
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	94	comments
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	95	return (Just e)
c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	96	return $ VarDeclaration False (ids, t) init
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	97
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	98
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	99	constsDecl = do
6317 83b93a2d2741 Improve parsing of complex references like "a^[b[c], d]" unc0rr parents: 6316 diff changeset	100	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	101	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	102	return vs
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	103	where
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	104	aConstDecl = do
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	105	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	106	i <- iD
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	107	t <- optionMaybe $ do
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	108	char ':'
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	109	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	110	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	111	comments
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	112	return t
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	113	char '='
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	114	comments
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	115	e <- initExpression
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	116	comments
6875 6528171ce36d First try to compile with clang: improve renderer a bit. The result of pas2c is still far from normal C source. unc0rr parents: 6858 diff changeset	117	return $ VarDeclaration (isNothing t) ([i], fromMaybe (DeriveType e) t) (Just e)
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	118
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	119	typeDecl = choice [
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	120	char '^' >> typeDecl >>= return . PointerTo
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	121	, try (string "shortstring") >> return (String 255)
a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	122	, 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	123	, try (string "ansistring") >> optionMaybe (brackets pas $ integer pas) >>= return . String . fromMaybe 255
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	124	, arrayDecl
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	125	, 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	126	, 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	127	, functionType
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	128	, sequenceDecl >>= return . Sequence
6489 e1f0058cfedd Add base type tags to identifiers unc0rr parents: 6467 diff changeset	129	, 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	130	, 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	131	] <?> "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	132	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	133	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	134	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	135	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	136	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	137	comments
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	138	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	139	char '['
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	140	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	141	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	142	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	143	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	144	string "of"
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	145	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	146	t <- typeDecl
6426 2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	147	if null r then
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	148	return $ ArrayDecl Nothing t
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	149	else
2d44f6561e72 Help parser a bit unc0rr parents: 6425 diff changeset	150	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	151	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	152	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	153	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	154	string "record"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	155	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	156	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	157	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	158	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	159	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	160	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	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	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	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	many unionCase
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	165	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	166	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	167	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	168	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	169	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	170	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	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	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	173	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	174	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	175	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	176	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	177	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	178	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	179	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	180	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	181	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	182	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	183	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	184	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	185	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	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	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	188	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	189	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	190	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	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	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	193	else
6826 8fadeefdd352 Just some further work unc0rr parents: 6626 diff changeset	194	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	195	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	196	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	197	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	198
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	199	typesDecl = many (aTypeDecl >>= \t -> comments >> return t)
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	200	where
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	201	aTypeDecl = do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	202	i <- try $ do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	203	i <- iD <?> "type declaration"
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	204	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	205	char '='
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	206	return i
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	207	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	208	t <- typeDecl
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	semi pas
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	return $ TypeDeclaration i t
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	213
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	214
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	215	rangeDecl = choice [
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	216	try $ rangeft
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	217	, 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	218	] <?> "range declaration"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	219	where
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	220	rangeft = do
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	221	e1 <- initExpression
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	222	string ".."
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	223	e2 <- initExpression
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	224	return $ RangeFromTo e1 e2
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	225
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	226	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	227	varSection,
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	228	constSection,
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	229	typeSection,
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	230	funcDecl,
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	231	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	232	]
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	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	234	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	235	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	236	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	237	v <- varsDecl1 True <?> "variable declaration"
6272 a93cb9ca9fda - Update to compile with parsec 3.* unc0rr parents: 6270 diff changeset	238	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	239	return v
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	240
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	241	constSection = do
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	242	try $ string "const"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	243	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	244	c <- constsDecl <?> "const declaration"
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	245	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	246	return c
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	247
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	248	typeSection = do
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	249	try $ string "type"
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	250	comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	251	t <- typesDecl <?> "type declaration"
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	252	comments
627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	253	return t
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	254
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	255	operatorDecl = do
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	256	try $ string "operator"
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	257	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	258	i <- manyTill anyChar space
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	259	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	260	vs <- parens pas $ varsDecl False
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	261	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	262	rid <- iD
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	263	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	264	char ':'
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	265	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	266	ret <- typeDecl
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	267	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	268	return ret
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	269	char ';'
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	270	comments
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	271	forward <- liftM isJust $ optionMaybe (try (string "forward;") >> comments)
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	272	many functionDecorator
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	273	b <- if isImpl && (not forward) then
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	274	liftM Just functionBody
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	275	else
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	276	return Nothing
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	277	return $ [OperatorDeclaration i rid ret vs b]
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	278
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	279
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	280	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	281	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	282	comments
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	283	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	284	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	285	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	286	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	287	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	288	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	289	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	290	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	291	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	292	else
6836 42382794b73f - Treat strings as arrays of chars unc0rr parents: 6826 diff changeset	293	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	294	char ';'
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	295	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	296	forward <- liftM isJust $ optionMaybe (try (string "forward;") >> 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	297	many functionDecorator
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	298	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	299	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	300	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	301	return Nothing
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	302	return $ [FunctionDeclaration i ret vs b]
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	303
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	304	functionDecorator = choice [
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	305	try $ string "inline;"
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	306	, try $ caseInsensitiveString "cdecl;"
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	307	, try $ string "overload;"
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	308	, try $ string "export;"
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	309	, try $ string "varargs;"
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	310	, try (string "external") >> comments >> iD >> optional (string "name" >> comments >> stringLiteral pas)>> string ";"
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	311	] >> comments
6443 23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	312
23364a5fcc86 - Help parser by dropping that insane formatting syntax in str function unc0rr parents: 6426 diff changeset	313
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	314	program = do
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	315	string "program"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	316	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	317	name <- iD
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	318	(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	319	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	320	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	321	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	322	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	323	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	324	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	325	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	326	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	327	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	328	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	329	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	330
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	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	332	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	333	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	334	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	335	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	336	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	337	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	338	return $ Interface u (TypesAndVars tv)
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	339
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	340	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	341	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	342	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	343	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	344	comments
6277 627b5752733a A try to improve parser move (has regressions) unc0rr parents: 6275 diff changeset	345	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	346	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	347	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	348	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	349
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	expression = buildExpressionParser table term <?> "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	351	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	352	term = comments >> choice [
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	353	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	354	, try (parens pas $ expression >>= \e -> notFollowedBy (comments >> char '.') >> return e)
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	355	, brackets pas (commaSep pas iD) >>= return . SetExpression
6412 4b9a59116535 - Split PascalParser into modules unc0rr parents: 6399 diff changeset	356	, try $ natural pas >>= \i -> notFollowedBy (char '.') >> (return . NumberLiteral . show) i
6452 7c6f9b6672dc More work on the parser unc0rr parents: 6450 diff changeset	357	, float pas >>= return . FloatLiteral . show
7c6f9b6672dc More work on the parser unc0rr parents: 6450 diff changeset	358	, natural 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	359	, try (string "_S" >> stringLiteral pas) >>= return . StringLiteral
7070 8d4189609e90 oops, wrong type unc0rr parents: 7069 diff changeset	360	, 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	361	, stringLiteral pas >>= return . strOrChar
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	362	, 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	363	, 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	364	, char '$' >> many hexDigit >>= \h -> comments >> return (HexNumber h)
6412 4b9a59116535 - Split PascalParser into modules unc0rr parents: 6399 diff changeset	365	, char '-' >> expression >>= return . PrefixOp "-"
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	366	, try $ string "nil" >> return Null
6467 090269e528df - Improve parsing of prefix operators unc0rr parents: 6453 diff changeset	367	, try $ string "not" >> expression >>= return . PrefixOp "not"
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	368	, 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	369	] <?> "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	370
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	371	table = [
6290 c6245ed6cbc0 Some improvements to the parser unc0rr parents: 6277 diff changeset	372	[ 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	373	, Infix (char '/' >> return (BinOp "/")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	374	, Infix (try (string "div") >> return (BinOp "div")) AssocLeft
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	375	, Infix (try (string "mod") >> return (BinOp "mod")) AssocLeft
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	376	, Infix (try (string "in") >> return (BinOp "in")) AssocNone
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	377	]
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	378	, [ 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	379	, Infix (char '-' >> return (BinOp "-")) AssocLeft
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	380	]
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	381	, [ 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	382	, 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	383	, 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	384	, 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	385	, Infix (char '>' >> return (BinOp ">")) AssocNone
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	386	]
7043 7c080e5ac8d0 Some work to make more units compile after conversion to c unc0rr parents: 6897 diff changeset	387	, [ Infix (try $ string "shl" >> return (BinOp "shl")) AssocNone
7c080e5ac8d0 Some work to make more units compile after conversion to c unc0rr parents: 6897 diff changeset	388	, Infix (try $ string "shr" >> return (BinOp "shr")) AssocNone
7c080e5ac8d0 Some work to make more units compile after conversion to c unc0rr parents: 6897 diff changeset	389	]
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	390	, [ Infix (try $ string "and" >> return (BinOp "and")) AssocLeft
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	391	, Infix (try $ string "or" >> return (BinOp "or")) AssocLeft
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	392	, Infix (try $ string "xor" >> return (BinOp "xor")) AssocLeft
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	393	]
7069 bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	394	, [
bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	395	Infix (char '=' >> return (BinOp "=")) AssocNone
bcf9d8e64e92 pas2c stuff again unc0rr parents: 7067 diff changeset	396	]
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	397	]
7067 f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	398	strOrChar [a] = CharCode . show . ord $ a
f98ec3aecf4e A solution to char vs string problem: mark single-letter strings with _S macro unc0rr parents: 7066 diff changeset	399	strOrChar a = StringLiteral a
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	400
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	401	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	402	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	403	comments
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	404	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	405	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	406	return $ Phrases p
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	407
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	408	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	409	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	410	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	411	, 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	412	, whileCycle
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	413	, 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	414	, switchCase
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	415	, withBlock
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	416	, forCycle
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	417	, (try $ reference >>= \r -> string ":=" >> return r) >>= \r -> expression >>= return . Assignment r
6895 31def088a870 Many small improvements to pas2c unc0rr parents: 6891 diff changeset	418	, 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	419	, procCall
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	420	, 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	421	]
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	422	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	423	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	424	return o
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	425
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	426	ifBlock = 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	427	try $ string "if"
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	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	429	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	430	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	431	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	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	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	434	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	435	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	436	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	437	comments
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	438	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	439	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	440	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	441	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	442
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	443	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	444	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	445	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	446	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	447	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	448	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	449	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	450	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	451	return $ WhileCycle e o
4353 671d66ba3af6 Dumb parser of pascal, and a program which lists unit dependencies unC0Rr parents: diff changeset	452
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	453	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	454	try $ string "with" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	455	comments
6387 3dcb839b5904 Less code unc0rr parents: 6386 diff changeset	456	rs <- (commaSep1 pas) reference
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	457	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	458	string "do"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	459	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	460	o <- phrase
6387 3dcb839b5904 Less code unc0rr parents: 6386 diff changeset	461	return $ foldr WithBlock o rs
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	462
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	463	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	464	try $ string "repeat" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	465	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	466	o <- many phrase
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	467	string "until"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	468	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	469	e <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	470	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	471	return $ RepeatCycle e o
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	472
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	473	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	474	try $ string "for" >> space
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	475	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	476	i <- iD
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	477	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	478	string ":="
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	479	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	480	e1 <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	481	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	482	choice [string "to", string "downto"]
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	483	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	484	e2 <- expression
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	485	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	486	string "do"
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	487	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	488	p <- phrase
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	489	comments
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	490	return $ ForCycle i e1 e2 p
f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	491
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	492	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	493	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	494	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	495	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	496	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	497	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	498	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	499	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	500	o2 <- optionMaybe $ do
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	501	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	502	comments
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	503	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	504	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	505	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	506	string "end"
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	507	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	508	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	509	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	510	aCase = do
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	511	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	512	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	513	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	514	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	515	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	516	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	517	return (e, p)
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	518
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	519	procCall = do
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	520	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	521	p <- option [] $ (parens pas) parameters
6450 14224c9b4594 - Improvement to the parser unc0rr parents: 6444 diff changeset	522	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	523
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	524	parameters = (commaSep pas) expression <?> "parameters"
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	525
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	functionBody = do
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	527	tv <- typeVarDeclaration True
a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	528	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	529	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	530	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	531	comments
6399 a904c735979c Improve parser and converter unc0rr parents: 6397 diff changeset	532	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	533
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	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	535	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	536	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	537	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	538	comments
6275 f1b4f37dba22 Many improvements to the parser unc0rr parents: 6272 diff changeset	539	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	540	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	541	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	542	return u
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	543
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	544	initExpression = buildExpressionParser table term <?> "initialization expression"
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	545	where
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	546	term = comments >> choice [
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	547	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	548	, try $ brackets pas (commaSep pas $ initExpression) >>= return . InitSet
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	549	, try $ parens pas (commaSep pas $ initExpression) >>= return . InitArray
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	550	, parens pas (sepEndBy recField (char ';' >> comments)) >>= return . InitRecord
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	551	, try $ integer pas >>= \i -> notFollowedBy (char '.') >> (return . InitNumber . show) i
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	552	, try $ float pas >>= return . InitFloat . show
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	553	, try $ integer pas >>= return . InitNumber . show
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	554	, stringLiteral pas >>= return . InitString
6444 eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	555	, char '#' >> many digit >>= \c -> comments >> return (InitChar c)
eddc1e9bcd81 - Help parser more unc0rr parents: 6443 diff changeset	556	, 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	557	, char '@' >> initExpression >>= \c -> comments >> return (InitAddress c)
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	558	, 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	559	, itypeCast
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	560	, iD >>= return . InitReference
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	561	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	562
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	563	recField = do
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	564	i <- iD
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	565	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	566	char ':'
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	567	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	568	e <- initExpression
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	569	spaces
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	570	return (i ,e)
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	571
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	572	table = [
7066 12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	573	[
12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	574	Prefix (char '-' >> return (InitPrefixOp "-"))
12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	575	]
12cc2bd84b0b Make pas2c even more happier with uGears.c, allow assigning arrays in some cases unc0rr parents: 7043 diff changeset	576	, [ Infix (char '' >> return (InitBinOp "")) AssocLeft
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	577	, Infix (char '/' >> return (InitBinOp "/")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	578	, Infix (try (string "div") >> return (InitBinOp "div")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	579	, Infix (try (string "mod") >> return (InitBinOp "mod")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	580	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	581	, [ Infix (char '+' >> return (InitBinOp "+")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	582	, Infix (char '-' >> return (InitBinOp "-")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	583	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	584	, [ Infix (try (string "<>") >> return (InitBinOp "<>")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	585	, Infix (try (string "<=") >> return (InitBinOp "<=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	586	, Infix (try (string ">=") >> return (InitBinOp ">=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	587	, Infix (char '<' >> return (InitBinOp "<")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	588	, Infix (char '>' >> return (InitBinOp ">")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	589	, Infix (char '=' >> return (InitBinOp "=")) AssocNone
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	590	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	591	, [ Infix (try $ string "and" >> return (InitBinOp "and")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	592	, Infix (try $ string "or" >> return (InitBinOp "or")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	593	, Infix (try $ string "xor" >> return (InitBinOp "xor")) AssocLeft
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	594	]
6858 608c8b057c3b Improve rendering into C unc0rr parents: 6836 diff changeset	595	, [ Infix (try $ string "shl" >> return (InitBinOp "shl")) AssocNone
608c8b057c3b Improve rendering into C unc0rr parents: 6836 diff changeset	596	, Infix (try $ string "shr" >> return (InitBinOp "shr")) AssocNone
6355 734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	597	]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	598	, [Prefix (try (string "not") >> return (InitPrefixOp "not"))]
734fed7aefd3 Introduce initialization expressions unc0rr parents: 6317 diff changeset	599	]
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	600
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	601	itypeCast = do
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	602	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	603	i <- parens pas initExpression
11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	604	comments
6618 2d3232069c4b Propagate types on identifiers unc0rr parents: 6512 diff changeset	605	return $ InitTypeCast (Identifier t BTUnknown) i
6453 11c578d30bd3 Countless imporvements to the parser and countless help to the parser in sources. unc0rr parents: 6452 diff changeset	606
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	607	builtInFunction e = do
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	608	name <- choice $ map (\s -> try $ caseInsensitiveString s >>= \i -> notFollowedBy alphaNum >> return i) builtin
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	609	spaces
6897 a9126661f613 Fix parsing of exit() call without parameters unc0rr parents: 6895 diff changeset	610	exprs <- option [] $ parens pas $ option [] $ commaSep1 pas $ e
6388 14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	611	spaces
14718b2685a3 Recognize some built-in functions unc0rr parents: 6387 diff changeset	612	return (name, exprs)
6512 0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	613
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	614	systemUnit = do
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	615	string "system;"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	616	comments
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	617	string "type"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	618	comments
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	619	t <- typesDecl
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	620	string "var"
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	621	v <- varsDecl True
0df7f6697939 "System" unit to help converter unc0rr parents: 6489 diff changeset	622	return $ System (t ++ v)

author	Medo <smaxein@googlemail.com>
	Wed, 23 May 2012 22:46:37 +0200
changeset 7123	9fe1c4091dd1
parent 7070	8d4189609e90
child 7315	59b5b19e6604
permissions	-rw-r--r--