commit 33feb2c0315251a19a420b63640130759c21207f
Merge: 4200c92 96f0960
Author: Hang Qian <hangqian90@gmail.com>

    Code freeze. Ready to go!

commit 96f0960109195bbd60a4f395f02f42b1b01eaa92
Author: Hang Qian <hangqian90@gmail.com>

    Add test files; Freeze code

commit 89cc431de4fab6835b68c6dde1ad9a05df9c2496
Author: Hang Qian <hangqian90@gmail.com>

    Fix semicolon

commit 5d97723cd1f478dc54aaaa13157cdad036917100
Merge: d698529 5aa043d
Author: Hang Qian <hangqian90@gmail.com>

    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit d6985294a970d1448a318bac0f27ef35299a0b2a
Author: Hang Qian <hangqian90@gmail.com>

    rm parser.ml

commit 5aa043d433443d376486f770f1f977b3cfb4aa88
Merge: 15ea38d 6cc1598
Author: Alex <alex.xiat@gmail.com>

    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 15ea38d24a9f5e061b04782c568cf7ae42bc344b
Author: Alex <alex.xiat@gmail.com>

    fix semicolon

commit 6cc1598f622709e074f7bb072dfe58206012da02
Merge: a583902 14150e9
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit a583902147134b96d93f2f9aefb33f1a18699bfb
Author: Hang Qian <hangqian90@gmail.com>


    fix demo

commit 48b07955cd82bb6081dcaa88f56968c753f01cf1
Author: Hang Qian <hangqian90@gmail.com>


    Add inline function support

commit ca72b3b1bec01b0be029560d389feaa600193560
Author: Hang Qian <hangqian90@gmail.com>


    support inline code

commit 14150e998386c099477ccd1a3aa1493171b8769e
Author: Pindan <qingluo0707@gmail.com>


    Now tests for scanner all work.

commit e6726f540d2d4a7806a27970ce5a518c81bf48cc
Author: Hang Qian <hangqian90@gmail.com>


    clean up

commit eac685f2d6dc05551f5d4a7ca1314e2f30b45d3d
Author: Hang Qian <hangqian90@gmail.com>


    All working except scanner test

commit 0ce092150ea59a3032377c34f5077b519ec65524
Author: Alex <alex.xiat@gmail.com>


    semantic: remove semi colon after }

commit 8ed3b34c739082adf5434aa7649c6ada7351b8b2
Author: Hang Qian <hangqian90@gmail.com>


    fix

commit 4200c927d49d915f74a754534761e041f31b198e
Merge: 562b6ee e1d62fc
Author: Hang Qian <hangqian90@gmail.com>


    Praise God! Finally working!

commit e1d62fc47c5550b11d864cc2504b513624d3c42a
Merge: 41ffe06 878738d
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'haq' into dev

commit 878738d309c5ab6cc202d0bc5eacb7f7f117df79
Merge: f0ead8a f1de9bd
Author: Hang Qian <hangqian90@gmail.com>


    Finally working

commit f1de9bddb31e1835816ecc55b268a75f724c3704
Author: Hang Qian <hangqian90@gmail.com>


    let's merge

commit 41ffe067fdd850f8bf99a838003abf30d464eabe
Merge: 116b351 f0ead8a
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'haq' into dev

commit f0ead8ad7b76163200ef93a6bca824be9d74ebed
Author: Hang Qian <hangqian90@gmail.com>


    Change name

commit 1f57a5e7d0b6c55fccd122a57a103a2f7510a6cb
Author: Hang Qian <hangqian90@gmail.com>


    Code Generating works

commit 95a11149b50a0b315cce7eaba952b579a6156b02
Author: Alex <alex.xiat@gmail.com>


    code generate

commit b5c8a288621f92f4efd5ff2c1c064112ce79711b
Author: Alex <alex.xiat@gmail.com>


    code generation

commit 116b351d74a113f9d6153cf670b04339e2420839
Merge: 90ed030 7f31445
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_test' into dev

commit 7f3144583d92f2cec4f33387500cbc31474d94a8
Author: Alex <alex.xiat@gmail.com>


    Test Parser done

commit 90ed030682dd9da3cb242342a64e890c4afc4801
Author: Hang Qian <hangqian90@gmail.com>


    remove parser.ml

commit ea4593557ab557f6be515bf9a00903a1b3053f67
Author: Hang Qian <hangqian90@gmail.com>


    fix obj

commit 8d43f6f1d4a38ea829fa433a806abcc9b0a145f0
Author: Hang Qian <hangqian90@gmail.com>


    fix obj syntax; change uitls

commit b94c26d52de7ba9042e5369894b4244236242742
Author: Hang Qian <hangqian90@gmail.com>


    Codegen alpha

commit 3f9951f94e7f72ee8cb57c67e235159fb03aaf5d
Merge: 0f760a8 fe7dfd0
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into parser_test

commit fe7dfd035320b42ff54c4ce31b25d0efeaf7c871
Merge: be863c0 456eaa5
Author: Pindan <qingluo0707@gmail.com>


    Enable printing line number when encountering wrong indent.

commit 456eaa543cf5e2fe990ad3cbacdf9b257983cefe
Author: Pindan <qingluo0707@gmail.com>


    Enable printing line number when encountering wrong indent.

commit be863c0dde59b9ed79b9a963ee2ef83838294160
Merge: cb189b0 b8b4a49
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'pindan' into dev

commit b8b4a49ffdb2306a9afb9724fca091cb46231956
Author: Pindan <qingluo0707@gmail.com>


    Update scanner.mll.

commit cb189b0bc36aed5c2b677c246ad36ff7632e7d1d
Author: Hang Qian <hangqian90@gmail.com>


    Change OBJ syntax

commit 0f760a8cd54a67e11c258f74ff779ffc4f9cd926
Merge: 219c912 b47c056
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into parser_test

commit 219c91230496f6629914e49a2c6014a5e004ed97
Merge: 578222b cd9585f
Author: Alex <alex.xiat@gmail.com>


    test_assign

commit b47c0567f7538cb56f63659235565b9d4965ea59
Merge: be817b1 a2593aa
Author: Hang Qian <hangqian90@gmail.com>


    merge

commit be817b1f95d17f3697795af6cf7d22a1573718be
Author: Hang Qian <hangqian90@gmail.com>


    fix IF block bug

commit a2593aa711dbb5c401a13965218c257f2008fdec
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    fix typo

commit a9926630187e89cb1c2d4ecf6e70cc59b90cc3d5
Merge: e60ecc9 9b4b910
Author: Pindan <qingluo0707@gmail.com>


    Fix conflicts in Utils.ml.

commit 9b4b910ceda0bdef70f097ad2c142ccdaf8d974b
Author: Pindan <qingluo0707@gmail.com>


    Update utils.ml

commit e60ecc94e97c542392a0e011c0747b341bc7afe0
Author: Hang Qian <hangqian90@gmail.com>


    Fix typo

commit 562b6ee3dbab8408a8c922478d278965ec34da97
Merge: 70bc113 cd9585f
Author: Hang Qian <hangqian90@gmail.com>


    It's time for v0.3

commit cd9585f6a62ba0dccae90e951300a2c017a6e754
Merge: 8adeeae 906d4af
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 8adeeae4c6ec9a75b70e370edfce68d9cb6f17b7
Author: Hang Qian <hangqian90@gmail.com>


    Fix Indent bug

commit 906d4afeafe1341c068bb31ffa5c442a975241dc
Author: Pindan <qingluo0707@gmail.com>


    Add comments to utils.ml.

commit 0494d59640f808777f38268df26d45a212ba582c
Merge: c9f4caf ec929af
Author: Pindan <qingluo0707@gmail.com>


    Add back Makefile in src.

commit c9f4caf0145e5c950a2f694dd3de447d7c6b9810
Author: Pindan <qingluo0707@gmail.com>


    New makefile at root folder: generate documents enabled.

commit 578222b8687fea4b7d70bcf044f5daed10593011
Merge: fc8f108 d71b0f5
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_test' of https://bitbucket.org/lga/lga into parser_test

commit fc8f108322d55aa4e979ee17ffc607516f00ff0d
Author: Alex <alex.xiat@gmail.com>


    assign test

commit d71b0f5b203ade463f42710868167135ddec840e
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    semantics

commit 70bc11381d6e4623d1e2326359f74faef29b6b50
Merge: 448b47c ec929af
Author: Hang Qian <hangqian90@gmail.com>


    Sementic now working.
    
    But parser seems broken now.

commit 12701471004cca21775b2aab7804aaf3eb10c76e
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit ec929af81dddc117aee8fb64dce8492817c6e583
Merge: 52228b0 f2b4704
Author: Hang Qian <hangqian90@gmail.com>


    Resolve conflicts

commit 52228b03fa19aca187ad9f115a07465ecfb47765
Merge: 234747d 6e9f602
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'haq' into dev

commit 6e9f6029bfd788c0cc7210cd7621c11576b4d6a8
Author: Hang Qian <hangqian90@gmail.com>


    Ast now working

commit f2b4704fd5bcc992344f66f4f18fab44190a3cd2
Author: Pindan <qingluo0707@gmail.com>


    Update test_scanner: catch token list not matching exception.

commit d11add8a55650ff628795875f2a8ce924ee3d121
Author: Pindan <qingluo0707@gmail.com>


    Update scanner.mll.

commit 40ee3cdf59add7ddcaf41c7884a9d97e310e6741
Author: Pindan <qingluo0707@gmail.com>


    Update utils.ml and tests.

commit 8a70a09ad763a625ee67a87c00b15b74e70f0e6f
Merge: 37e095b 234747d
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into parser_test

commit 10ec87f3597a6adf6901a6200dde55ae01cfa15e
Merge: b770617 234747d
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    Merge branch 'dev' into parser_test

commit 234747dd32dddd7e146a4d130f4c99e13b05553f
Author: Pindan <qingluo0707@gmail.com>


    Fix scanner test

commit b7706172b704898e18b8eb8fc0ae9376857516ca
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit 949ff378f1cbc8a0044befd4795373be03f54471
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    test files

commit 763ee69677777f88f520b488053b7a2809092dcd
Merge: 84563d3 37e095b
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    Merge branch 'parser_test' of https://bitbucket.org/lga/lga into parser_test

commit 84563d3c2a608f60eb74c93a681f7f6642c0b722
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    changes to test_in files

commit 2d75a2f46bd026ee6cec59de5f595d88cc7aa2aa
Merge: 3a8eabe f99db5c
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' into pindan

commit f99db5c0b3d90f54a8bd7b8cee36fa38725f0f6e
Author: Hang Qian <hangqian90@gmail.com>


    Fix EOF bug

commit 3a8eabe976889e1416856d6e0d6a5ac856479243
Merge: f71a70d c63f933
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' into pindan

commit f71a70d364d940aa41d91d345854f67c8919932e
Author: Pindan <qingluo0707@gmail.com>


    Update util.ml.

commit 37e095bf006ab044b499bab7068a2d434d2d7474
Merge: 9861a2e cbdf8aa
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_test' of https://bitbucket.org/lga/lga into parser_test

commit 9861a2efe6d91371d39e06d04635e9a18501902d
Author: Alex <alex.xiat@gmail.com>


    parser testing FOR

commit cbdf8aabfb546549f12cc93742b77979b09ace9a
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    update utils file

commit 98473d3c6bd772b1e7b46bcf5c1e3f7764e70be9
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    create test function file

commit 641d79c42c05d64eebdd949dbe830bd749fd2ea6
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    test_out files added

commit c63f933f67dd5aa15ce725d63434dbe1e210360b
Author: Hang Qian <hangqian90@gmail.com>


    udpate test_scanner

commit 0e583817953f6a5609861fbf3e55af1843ab2cf9
Author: Hang Qian <hangqian90@gmail.com>


    Implement some util function

commit 68a7ad33be7e7114802ea258bacaa43638a545b9
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    parser test_in

commit d022d4e6672f0fe9f04ddf3104dadba0f6ad70b1
Author: Hang Qian <hangqian90@gmail.com>


    Add rectype flag

commit 448b47cc6ca9a730de4ac7b950fdb54d4fa55ac4
Merge: cf9c11a 0b34c01
Author: Hang Qian <hangqian90@gmail.com>


    Fix

commit 0b34c010a126434247564a1fb3d3cecf30baddaf
Author: Hang Qian <hangqian90@gmail.com>


    fix reduce/reduce conflicts

commit cf9c11aceed0411694b80ed8d7332c51966140f4
Merge: 74463c4 185fa45
Author: Hang Qian <hangqian90@gmail.com>


    Parser done!

commit 185fa45899518285a7fe31c5e6f1e564872d212c
Author: Hang Qian <hangqian90@gmail.com>


    fix typesetting

commit d9728d89423637e9cf8fd92b5827bb3112a20deb
Author: Hang Qian <hangqian90@gmail.com>


    Good Lord!
    All compile!

commit bfddb46b361f46aea1ee9db354a714109ced83a3
Author: Hang Qian <hangqian90@gmail.com>


    fix

commit 96c3ddd26703985b2eaf57952c6828803ff22df8
Author: Hang Qian <hangqian90@gmail.com>


    Add root to ast.mli

commit 74463c40bd00f49cf20f9b20e7a3d72691135738
Merge: 066c511 60e2bda
Author: Hang Qian <hangqian90@gmail.com>


    Ast compiles!

commit 60e2bda27c8fe6d7bee47e2fa09616516efec6a1
Merge: d6b298c ddb17e0
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit d6b298c4f90e06cc913f2e0e4f94c7496ba840d0
Author: Hang Qian <hangqian90@gmail.com>


    Dear Lord,
    
    I thank you for offering us polymorphic types in OCaml.
    
    Yours,
            Hang

commit ddb17e0be62a41e3c45abfa0b95616d7a16cd17e
Merge: f911cbf a3fe2b1
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit f911cbf55fe4dab93c0c6580073464b8af1b7281
Author: Pindan <qingluo0707@gmail.com>


    Scanner test suite change due to language change.

commit a3fe2b139999fb4ca08db4bd9e21d9bd5b1393b3
Author: Hang Qian <hangqian90@gmail.com>


    Fix missing FUN

commit cb9cd8c6b7e9ebc87aa74b7d7f9ea874a1d3e0df
Merge: e13d901 f9f60ca
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    No conflict in parser

commit f9f60ca31b55322651d331765d9f08862fea28e2
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    No conflict in parser

commit e13d9016a681707b39badf72c73588692f999dff
Author: Hang Qian <hangqian90@gmail.com>


    Change token definition in parser.mly.
    Change bool handling in scanner.mll.

commit a5d6905e5315997a5efb2739322f292728b5be31
Author: Hang Qian <hangqian90@gmail.com>


    Change on scanner;
    
    1. Change NUM token to string
       Because we Literal to handle NUM and STRING, there's no need to to conversion
       at the lexing stage.
    2. Add FUN keyword to denote function declaration.
       We use "fun" keyword to resolve potential reduce/reduce conflict in parser.

commit 9d5f6c2e10226b3fa21b88bd3a021ea8c871704b
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit 2557e807068b8fcd9236b2ac412603a74fc64365
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit 706880a96b9c444ec8c15b7ca0058b02e75296d1
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit a731719e9fefbeff1f58672519f6f17d124281b3
Merge: 066c511 7e933cc
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'dev' into haq

commit 7e933cce4d6757423ec37fdfd23198fc8fe0cd5e
Author: Hang Qian <hangqian90@gmail.com>


    keep debugging

commit 6b4b195cc190b92b0ce6595eede84a0333255680
Author: Hang Qian <hangqian90@gmail.com>


    fix Return error

commit d314b8d97e4b627dadd71bf8b6c9033f720793fd
Author: Alex <alex.xiat@gmail.com>


    debug parser

commit 06f17dcc5ba76e0a8f12e00f3bd0f7170c61fd5e
Merge: e80987e 5307925
Author: Alex <alex.xiat@gmail.com>


    Merged but broken

commit 98a2bb18ba4aa79837d589e573f5cadc41269d63
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    xx

commit 5307925e28b986d62a9cac2a259f3e7aa9746f01
Author: Alex <alex.xiat@gmail.com>


    parser alpha

commit 5ceecd3659b7571fc6821450890290307400b484
Merge: 2b1ca85 545be03
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_dev' of https://bitbucket.org/lga/lga into parser_dev

commit 2b1ca853e7baaf6f54103691c226a1a9ff6715d5
Author: Alex <alex.xiat@gmail.com>


    parser_new

commit 545be033c3bc81a5ca2829a32a949506e7e3587e
Merge: 1de3d83 7116c4e
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    Merge branch 'parser_dev' of https://bitbucket.org/lga/lga into parser_dev

commit 1de3d8350765933e8eceef5ba1e930aa779b9e26
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    xx

commit 7116c4e9c7d540ab001ce2472c1f42f0568ebb5a
Merge: 90683f9 b78b766
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_dev' of https://bitbucket.org/lga/lga into parser_dev

commit b78b76685b4f58e1b885d430c16476d717e2d64c
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    xxx

commit 90683f901f436f9a22afabf13593aada8c1e8ba5
Author: Alex <alex.xiat@gmail.com>


    parser

commit 066c5112ffbcf616cd21e0081d4a71dc16769336
Merge: e1eb445 e80987e
Author: Hang Qian <hangqian90@gmail.com>


    Scanner looks good now.

commit e80987e38e80c864812ddf0d234fb342870722d0
Author: Hang Qian <hangqian90@gmail.com>


    fix Makefile

commit b624e606147ca4d5625a19599f9b3396e321eec4
Author: Hang Qian <hangqian90@gmail.com>


    update Makefile; Add test

commit 481855dc70389af1fc366e0681dd96970d372109
Author: Hang Qian <hangqian90@gmail.com>


    suppress warning

commit 97a230e03ada414c0c4a90c68580a7b148356a26
Merge: 8b602aa 122a37d
Author: Hang Qian <hangqian90@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 8b602aaff636be19f58b9da361235453e7b66a98
Author: Hang Qian <hangqian90@gmail.com>


    remove duplicate utils.ml

commit 122a37d3d033016f356e565994a151776e29bc55
Merge: 1eedd62 448e057
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 1eedd62773af0c8dd3471e8e2c6a6c7975204da2
Author: Pindan <qingluo0707@gmail.com>


    Add new test file.

commit 3332d92e12e73c9ac723a008a18af6c932701ab1
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    modify op

commit 1ca1f8632a99b2e7233b8f0f2824a483a23ab95c
Merge: dc250d5 e6261be
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'parser_dev' of https://bitbucket.org/lga/lga into parser_dev

commit dc250d593bcb652c15456339deedefca9c05a745
Author: Alex <alex.xiat@gmail.com>


    for parser

commit 448e0572579069f204180ef28303e43c0f5ba268
Author: Hang Qian <hangqian90@gmail.com>


    remove old test files

commit e6261be4dc262220b17b96462c5e3741be9e14ca
Merge: 8a75d3e 934ed78
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    Merge branch 'parser_dev' of https://bitbucket.org/lga/lga into parser_dev

commit 8a75d3e66a1115c70601d3027d9045fb8845df74
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    new ast Implement

commit 53dc8a3d2f52154a8b6f9b06820c292372d070ed
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit 41da1f4b14db11f8ab3a82e3c4a7b3ab4fab4a4c
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    no message

commit 3b409ad9322a4c44136380083a117279057a534d
Author: Pindan <qingluo0707@gmail.com>


    Update utils.ml

commit 7fdba8f6d57910db7098307fac1d64786a164b03
Author: Hang Qian <hangqian90@gmail.com>


    Oh Shi*t

commit 5a99700851fdf636c7bf6a86fd6af4493172dbaf
Author: Hang Qian <hangqian90@gmail.com>


    remove debug info

commit 761c9c070662221abd99064aef44582bf434297e
Author: Hang Qian <hangqian90@gmail.com>


    fix scanner_test

commit c0d9717c962e5233ad9b2c7f280e20cce013c145
Author: Pindan <qingluo0707@gmail.com>


    add parser.mly for test

commit a161289faf49c1713b7a9a469b2c0a37143abfcb
Author: Pindan <qingluo0707@gmail.com>


    fix scanner

commit 934ed78c37d221dc6a8ca59cb2fb353fc6ddb27d
Author: Alex <alex.xiat@gmail.com>


    move if while for to expression

commit 34b2260aeb1130bcd599fb1a1f8b70b97a447c16
Merge: 883cfbc ec04eba
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'parser_dev' into pindan

commit 883cfbc62ee9a0ec6e839e3f6b481b0fc3e5f461
Author: Pindan <qingluo0707@gmail.com>


    Change parser a little bit.

commit 5b458f140d7793bda68d174ae3f3c62abb4cb5bc
Author: Pindan <qingluo0707@gmail.com>


    Update utils.ml

commit 7d41912c5661b65583ef582a3e3bac6bf6ec87ce
Author: Pindan <qingluo0707@gmail.com>


    Complete the tokens in scanner.mll

commit ec04eba03aa677fe22604bb1e074a1681dc88b1e
Author: Alex <alex.xiat@gmail.com>


    parser_new change object -> obj

commit 8da4e6ddb0103bf4a92302231da41f2de3981155
Author: Alex <alex.xiat@gmail.com>


    parser in dev

commit d8a22a65041011f20965d8d1b673e8cd34fbe430
Author: Alex <alex.xiat@gmail.com>


    changes on Tokens

commit 6c6164322e67f95921a1eea79f659a117f002572
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    xx

commit 7e6e89e011dbc18413573b50d33078fb80e39ce8
Author: Alex <alex.xiat@gmail.com>


    to parser_dev

commit f9a83c2311d3fd7cbf246df555d934856449ad4e
Author: Bank Qian <ibank.qh@gmail.com>


    remove scanner.ml

commit e19f4ee3ae5108659ace42ed22c61918edbb5401
Merge: c1fe90e 9d26473
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit c1fe90e74165d7ea4626b591166391a954956d0e
Merge: beb953c 4722cec
Author: Pindan <qingluo0707@gmail.com>


    merge

commit 9d2647346765d620439fa259e6898e4d650cdc5f
Author: Bank Qian <ibank.qh@gmail.com>


    remove binary

commit 1a6591b4e3d96be1b3c2b2439f49865df1bba9d3
Author: Bank Qian <ibank.qh@gmail.com>


    Auto test done

commit beb953c5aa27ac05ae6b7f779b233fb11c37798b
Author: Pindan <qingluo0707@gmail.com>


    Updated scanner.mll.

commit 4722cec63361e3e7e13b046f28c2f55dde082fb2
Author: Bank Qian <ibank.qh@gmail.com>


    lga renamed to semantic

commit 2a9d15a10e40c37550574c3141665e0ea62c38d5
Merge: 51ee213 b43cc17
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'scanner_test' into dev
    Fix TERMINATOR handling
    
    Now scanner has no problem with existing tokens

commit b43cc1706cf12b1516ab1555fa728d965fc419c1
Author: Bank Qian <ibank.qh@gmail.com>


    fix TERMINATOR

commit 51ee2134efd4f82e613c857b40946d96318d68e2
Author: Bank Qian <ibank.qh@gmail.com>


    fix

commit edc0657e72e94cebf65dd6a619c739c28b976cbd
Author: Bank Qian <ibank.qh@gmail.com>


    fix

commit 018f41dce1f0786937a387634212b5120b7e031f
Author: Bank Qian <ibank.qh@gmail.com>


    Now test_scanner have the complete token list

commit 3018d2adb07c5242279c4d9c7565bd5d293e57e2
Author: Bank Qian <ibank.qh@gmail.com>


    Successfully implement scanner for indent and dedent

commit 3be22f8501743c84b713ee76b17a3ca44842b601
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    add Alex’s code

commit 3841e017b4bfc339930079d87f1d8baf11abec13
Merge: 375f485 415a7eb
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'dev' into scanner_test

commit 375f485ba82c26a78dc9e90e4aaf12efcca36ee2
Author: Pindan <qingluo0707@gmail.com>


    Pindan is awesome

commit 415a7eb1c40108c319cfad4682fc2f6717615915
Merge: d2a3656 f635352
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'haq' into dev

commit f635352f5587036f2d27add928bce93745cf24db
Author: Bank Qian <ibank.qh@gmail.com>


    refactor test_scanner

commit d2a3656dc3b0ac39c3db5b6d79b710a3eec315f1
Merge: 7915444 256cff8
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'haq' into dev

commit 256cff8b7ce372f3eaff188c777e44675aa1b674
Author: Bank Qian <ibank.qh@gmail.com>


    Add gitignore

commit 7915444da56025ec87d17aed15554c35463cd86e
Merge: 3b1797a a70c220
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'haq' into dev.

commit a70c22040a60b9c685636a3f79e93d1d5ae7c43c
Author: Bank Qian <ibank.qh@gmail.com>


    test_scanner done

commit 3b1797af8ee84720e3afd99c7b81e4fe15636698
Author: Bank Qian <ibank.qh@gmail.com>


    Update doc makefile

commit 27753f25a55e6e8a81d095ce78c91ef44031cbdc
Author: Bank Qian <ibank.qh@gmail.com>


    Experiment with types

commit 8ccc477652239d2a2f8ac8787c1f8ca924944eca
Author: Bank Qian <ibank.qh@gmail.com>


    working

commit d37659b42b9e846b6de91c61ba1882ed4f5b9a09
Merge: dd61e56 1ef1c8d
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into haq

commit dd61e56b3eaaadef5b76aeb58701b8f6ceea9049
Author: Bank Qian <ibank.qh@gmail.com>


    Minor error

commit cdccbe83c601a86001119c05299f76b5137e2b03
Author: Bank Qian <ibank.qh@gmail.com>


    new Makefile

commit 1ef1c8dbeeefd23df6c2773aea59382912419cd1
Merge: 24a4527 cf0431b
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit cf0431bd2b38f90741034b01eeb50226074d9ebc
Merge: bb02b01 e80011d
Author: Ubuntu <carter@ubuntu.(none)>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit bb02b01c1d7cbde04ca029bc77c39ff1f62a19e1
Author: Ubuntu <carter@ubuntu.(none)>


    ast

commit 24a4527ef6be3faf52288104b2b467a7213da783
Author: Alex <alex.xiat@gmail.com>


    parser.mly

commit 381bc4f750723d5a566c1998a9982ff752f2ae02
Merge: 1e68419 e80011d
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'dev' into haq

commit e80011d077f64cd53b47cab71d94241442cd7d57
Author: Bank Qian <ibank.qh@gmail.com>


    Move files to LGA/src

commit 1e684198bc5a5afee8b78e05d759034f3c406746
Merge: e1eb445 28f2046
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branches 'dev' and 'dev' of https://bitbucket.org/lga/lga into haq

commit 28f2046eb11989391033fc90f9c283a7516f239b
Merge: e9da708 ef2a2f5
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit e9da7084a745a94865f0a6dc72b5b7211445c1a2
Author: Pindan <qingluo0707@gmail.com>


    Update scanner.

commit ef2a2f5041079d7c0dc1ae6955e8664b9b7a7d93
Author: Ubuntu <carter@ubuntu.(none)>


    ast.mli

commit 7e639d9a7049dee0a5fbe6b6acb5a15cc9fb681e
Author: Alex <alex.xiat@gmail.com>


    remove scanner.ml

commit 68d9b9fb691d6d64b159517f9c8f711aded02098
Merge: 683bcd6 43e517d
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 683bcd60b5ea24863050f79b5bc8583529ca6852
Author: Alex <alex.xiat@gmail.com>


    makefile

commit 43e517dfccc4172ed97ddaa833cace413acbae99
Author: Pindan <qingluo0707@gmail.com>


    Updated scanner.mll.

commit 3616b33b529744ca95525b4fcf45d203882a6557
Author: Ubuntu <carter@ubuntu.(none)>


    ast.mli

commit afb3369cfc95b7963911def7d00fe84aecc02bd5
Merge: 0f283cb 03efa64
Author: Alex <alex.xiat@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 03efa64850f1cf2dc81b6b54444eee846c63ef0a
Merge: 7a3c962 2068a68
Author: Pindan <qingluo0707@gmail.com>


    Merge branch 'dev' of https://bitbucket.org/lga/lga into dev

commit 7a3c96211919b78b7f8103732f4af488a9f03466
Author: Pindan <qingluo0707@gmail.com>


    Initialize scanner.mll.

commit 0f283cbcb560c16f72094b97a9f3c01316abac5f
Author: Alex <alex.xiat@gmail.com>


    parser

commit 2068a68af412f40ae78f865ac4db2f5af2853562
Author: Alex <alex.xiat@gmail.com>


    parser - beginning

commit e1eb445d2e16f63234be131762579d5e3c1a0ffb
Merge: e03dd6e d487d5e
Author: Bank Qian <ibank.qh@gmail.com>


    Merge branch 'dev'; Language Reference Manuall draft.

commit d487d5efd2d1ee97309f459aec878e64b8e84da7
Author: Yuanli Dong <cu.dongyuanli@gmail.com>


    Some description added in LRM control flow part

commit dd84b4f381f1f16945f72d8f3c2a5ffcb7d67230
Author: Bank Qian <ibank.qh@gmail.com>


    omit date

commit 8d7045e91e036559973ae41ab5625eddb021eab7
Author: Bank Qian <ibank.qh@gmail.com>


    minor change in sample code

commit e6d8e7a659c6e2f706b396917e7513ede218e746
Author: Bank Qian <ibank.qh@gmail.com>


    Correct UNI; Change structure

commit 80a72df029483954454a6c822edba302b3a3dfd5
Author: Bank Qian <ibank.qh@gmail.com>


    Add UNI; Add This property

commit e77e1df8855b4a9fe35567d4ee134c292a8dc690
Author: Bank Qian <ibank.qh@gmail.com>


    Corrections

commit fa28f935bf7b96f699b2b9912f3de93c2c7e9694
Author: Bank Qian <ibank.qh@gmail.com>


    file directory change

commit d3720f8cfdffbf1a5fbfe0fea6b8c83c9fba67e7
Author: Bank Qian <ibank.qh@gmail.com>


    minor change

commit 11109bd2dba3f77f52213fb6d3d84af282b1878c
Author: Bank Qian <ibank.qh@gmail.com>

 
    Add Reference Manual Draft

commit 9463e6248c8a00ef244753602904bbd1984bfa50
Author: Bank Qian <ibank.qh@gmail.com>


    Add Programming Guidelines
    
    	new file:   docs/guidelines.txt

commit e03dd6e7ea718514c17a68952a5c8a5a44fb9a81
Author: Bank Qian <ibank.qh@gmail.com>


     Initial commit
