Replace parser surface with a Parsec compatibility layer

.gitignore

@@ -1,4 +1,27 @@
 .stack-work
+.stack-root*/
+.cabal-local/
+.cabal-home/
+.cabal-store/
+.cabal-sandbox/
+.codex-home/
+.home/
+.serena/
+dist-newstyle/
+dist-newstyle-review*/
+dist-newstyle-sandbox/
+dist-newstyle-local/
+dist-review*/
+a.out
+.DS_Store
+*.hi
+*.hi-boot
+*.o
+*.o-boot
+*.dyn_hi
+*.dyn_o
+tmp*
+.tmp*
 *.swp
 bench_report.html
 docs/

README.md

@@ -61,9 +61,14 @@ $ gcc -no-pie t.s -o out
 For one liner:
 
 ```sh
-$ echo 'int printf(); int main() { printf("hello world!\n"); }' | stack exec htcc -- /dev/stdin | gcc -xassembler -no-pie -o out -  
+$ echo 'int printf(); int main() { printf("hello world!\n"); }' | stack exec htcc -- /dev/stdin | gcc -x assembler -no-pie -o out -
 ```
 
+When using `-r`/`--run-asm`, htcc uses the driver selected by
+`$HTCC_ASSEMBLER` for both assembly and linking.
+On hosts where `gcc` points to clang, set `HTCC_ASSEMBLER` to a
+GNU-compatible compiler driver before running htcc.
+
 ## AST diagram generation
 
 htcc has the ability to visualize ASTs built from loaded C code.
@@ -167,8 +172,9 @@ The implementation description is available in [here](https://falgon.github.io/h
 ## Specification and Requirements
 
 htcc outputs x86_64 assembly according to System V ABI [[2]](#cite2) and
-[GCC 7.4.0](https://gcc.gnu.org/onlinedocs/7.4.0/) is used for assemble. 
-Perhaps a newer version of GCC will work, but not checked currently.
+[GCC 7.4.0](https://gcc.gnu.org/onlinedocs/7.4.0/) is used for assemble.
+Perhaps a newer version of GCC will work, but not checked currently. When
+assembling via `-r`, choose the driver with `HTCC_ASSEMBLER`.
 
 ## About emoji of commit messages
 

docker/scripts/test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+find /htcc_work -name "*.s" -type f |\
+    while read fname; do 
+        gcc -xassembler -no-pie -o "$(dirname $fname)/$(basename $fname '.s').o" $fname
+        echo ">>>>> $fname"
+        ./$(dirname $fname)/$(basename $fname ".s").o
+    done

docker/test.dhall

@@ -9,9 +9,9 @@ let htccService =
       ⫽ { image = Some "roki/htcc_test:1.0.0"
         , command = Some
             ( types.StringOrList.String
-                "/bin/sh -c 'gcc -no-pie -o spec /htcc_work/spec.s && ./spec'"
+                "/bin/bash /htcc_work/scripts/test.sh"
             )
-        , volumes = Some [ "/tmp/htcc:/htcc_work" ]
+        , volumes = Some [ "/tmp/htcc:/htcc_work", "./docker/scripts:/htcc_work/scripts" ]
         , build = Some
             ( types.Build.Object
                 { context = "."

htcc.cabal

@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 22bacaccc5bc8617817eb1c982386f1b7ce9a77e1928a9f47181e1dcd7a27d2a
+-- hash: 850b9848b962537995097e4ec0c7bc1c88f136695936efa9068db58eece3242d
 
 name:           htcc
 version:        0.0.0.1
@@ -63,14 +63,28 @@ library
       Htcc.CRules.Types.CType
       Htcc.CRules.Types.StorageClass
       Htcc.CRules.Types.TypeKind
+      Htcc.Output
       Htcc.Parser
       Htcc.Parser.AST
       Htcc.Parser.AST.Core
       Htcc.Parser.AST.DeduceKind
       Htcc.Parser.AST.Type
-      Htcc.Parser.AST.Var
-      Htcc.Parser.AST.Var.Init
-      Htcc.Parser.ConstructionData
+      Htcc.Parser.Combinators
+      Htcc.Parser.Combinators.BasicOperator
+      Htcc.Parser.Combinators.ConstExpr
+      Htcc.Parser.Combinators.Core
+      Htcc.Parser.Combinators.Decl
+      Htcc.Parser.Combinators.Decl.Declarator
+      Htcc.Parser.Combinators.Decl.Spec
+      Htcc.Parser.Combinators.GNUExtensions
+      Htcc.Parser.Combinators.Keywords
+      Htcc.Parser.Combinators.ParserType
+      Htcc.Parser.Combinators.Program
+      Htcc.Parser.Combinators.Type
+      Htcc.Parser.Combinators.Type.Core
+      Htcc.Parser.Combinators.Type.Utils
+      Htcc.Parser.Combinators.Utils
+      Htcc.Parser.Combinators.Var
       Htcc.Parser.ConstructionData.Core
       Htcc.Parser.ConstructionData.Scope
       Htcc.Parser.ConstructionData.Scope.Enumerator
@@ -80,16 +94,12 @@ library
       Htcc.Parser.ConstructionData.Scope.Typedef
       Htcc.Parser.ConstructionData.Scope.Utils
       Htcc.Parser.ConstructionData.Scope.Var
-      Htcc.Parser.Parsing
-      Htcc.Parser.Parsing.Core
-      Htcc.Parser.Parsing.Global
-      Htcc.Parser.Parsing.Global.Function
-      Htcc.Parser.Parsing.Global.Var
-      Htcc.Parser.Parsing.StmtExpr
-      Htcc.Parser.Parsing.Type
-      Htcc.Parser.Parsing.Typedef
       Htcc.Parser.Utils
       Htcc.Parser.Utils.Core
+      Text.Megaparsec
+      Text.Megaparsec.Char
+      Text.Megaparsec.Char.Lexer
+      Text.Megaparsec.Debug
       Htcc.Tokenizer
       Htcc.Tokenizer.Core
       Htcc.Tokenizer.Token
@@ -114,20 +124,26 @@ library
     , cond
     , containers
     , deepseq
+    , directory
     , diagrams-contrib
     , diagrams-lib
     , diagrams-svg
     , extra
+    , filepath
+    , parsec
     , monad-finally
     , monad-loops
     , mono-traversable
     , mtl
     , natural-transformation
     , optparse-applicative
+    , parser-combinators
     , safe
     , split
     , text
     , transformers
+    , unix
+    , utf8-string
   default-language: Haskell2010
 
 executable htcc
@@ -136,7 +152,7 @@ executable htcc
       Paths_htcc
   hs-source-dirs:
       app
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -Werror -O2
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -O2
   build-depends:
       ansi-wl-pprint
     , base >=4.7 && <5
@@ -149,27 +165,38 @@ executable htcc
     , diagrams-svg
     , directory
     , extra
+    , filepath
     , htcc
+    , process
+    , parsec
     , monad-finally
     , monad-loops
     , mono-traversable
     , mtl
     , natural-transformation
     , optparse-applicative
+    , parser-combinators
     , safe
     , split
+    , template-haskell
     , text
     , transformers
+    , unix
+    , utf8-string
   default-language: Haskell2010
 
 test-suite htcc-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
+      Tests.ComponentsTests
+      Tests.ComponentsTests.AsmOutput
+      Tests.ComponentsTests.Parser.Combinators
       Tests.SubProcTests
-      Tests.Test1
-      Tests.Test2
-      Tests.Test3
+      Tests.SubProcTests.AsmOutput
+      Tests.SubProcTests.LinkFuncRet
+      Tests.SubProcTests.LinkFuncStdOut
+      Tests.SubProcTests.StatementEqual
       Tests.Utils
       Paths_htcc
   hs-source-dirs:
@@ -196,19 +223,22 @@ test-suite htcc-test
     , hspec-contrib
     , hspec-core
     , htcc
+    , parsec
     , monad-finally
     , monad-loops
     , mono-traversable
     , mtl
     , natural-transformation
     , optparse-applicative
+    , parser-combinators
     , process
     , safe
     , split
     , text
     , time
     , transformers
     , turtle
+    , unix
     , utf8-string
   default-language: Haskell2010
 
@@ -231,14 +261,17 @@ benchmark criterion
     , diagrams-svg
     , extra
     , htcc
+    , parsec
     , monad-finally
     , monad-loops
     , mono-traversable
     , mtl
     , natural-transformation
     , optparse-applicative
+    , parser-combinators
     , safe
     , split
     , text
     , transformers
+    , utf8-string
   default-language: Haskell2010

package.yaml

@@ -36,7 +36,9 @@ dependencies:
 - containers
 - bytestring
 - deepseq
+- directory
 - safe
+- filepath
 - mtl
 - monad-finally
 - mono-traversable
@@ -46,6 +48,10 @@ dependencies:
 - diagrams-lib
 - natural-transformation
 - optparse-applicative
+- parsec
+- parser-combinators
+- unix
+- utf8-string
 
 library:
   source-dirs: src
@@ -59,16 +65,30 @@ executables:
     - -rtsopts
     - -with-rtsopts=-N
     - -Wall
-    - -Werror
+      #- -Werror
     - -O2
     dependencies:
     - htcc
     - directory
+    - filepath
+    - process
+    - template-haskell
+    - unix
 
 tests:
   htcc-test:
     main:                Spec.hs
     source-dirs:         test
+    other-modules:
+    - Tests.ComponentsTests
+    - Tests.ComponentsTests.AsmOutput
+    - Tests.ComponentsTests.Parser.Combinators
+    - Tests.SubProcTests
+    - Tests.SubProcTests.AsmOutput
+    - Tests.SubProcTests.LinkFuncRet
+    - Tests.SubProcTests.LinkFuncStdOut
+    - Tests.SubProcTests.StatementEqual
+    - Tests.Utils
     ghc-options:
     - -threaded
     - -rtsopts
@@ -90,6 +110,7 @@ tests:
     - dhall-json
     - dhall-yaml
     - process
+    - unix
     - utf8-string
 
 benchmarks:

src/Htcc/Asm.hs

@@ -15,16 +15,17 @@ module Htcc.Asm (
     casm
 ) where
 
-import           Data.Tuple.Extra                                      (uncurry3)
-
+import           Data.Bits                                             (Bits)
 import           Htcc.Asm.Generate
 import qualified Htcc.Asm.Intrinsic.Operand                            as O
 import qualified Htcc.Asm.Intrinsic.Structure.Internal                 as SI
 import qualified Htcc.Asm.Intrinsic.Structure.Section.Text.Instruction as TI
 import           Htcc.Parser                                           (ASTs)
+import qualified Htcc.Parser.ConstructionData.Scope.Function           as PF
 import           Htcc.Parser.ConstructionData.Scope.Var                (GlobalVars,
                                                                         Literals)
+import           Htcc.Utils                                            (uncurry4)
 
 -- | Generate full assembly code from string of C source code
-casm :: (O.IsOperand i, TI.UnaryInstruction i, TI.BinaryInstruction i, Integral i) => (ASTs i, GlobalVars i, Literals i) -> IO ()
-casm = SI.runAsm . uncurry3 casm'
+casm :: (Bits i, Read i, Show i, Ord i, O.IsOperand i, TI.UnaryInstruction i, TI.BinaryInstruction i, Integral i) => (ASTs i, GlobalVars i, Literals i, PF.Functions i) -> IO ()
+casm = SI.runAsm . uncurry4 casm'