Add control flow AST

package.yaml

@@ -48,7 +48,9 @@ library:
   - union-find >= 0.2 && < 0.3
   - aeson >= 1.4.6 && < 1.5
   - text >= 1.2.3 && < 1.3
+  - string-interpolate >= 0.3.0
   - deepseq >= 1.4.4 && < 1.5
+  - natural-numbers >= 0.1.2
   - unordered-containers >= 0.2.10 && < 0.3
   - hashable >= 1.2.7 && < 1.3
 

src/IR/Circify/Control.hs

@@ -0,0 +1,59 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE KindSignatures #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE QuantifiedConstraints #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE DeriveFunctor #-}
+{-# LANGUAGE DeriveAnyClass #-}
+module IR.Circify.Control where
+
+import           Data.Natural
+import           Data.String.Interpolate   (i)
+import           Control.Monad.State.Lazy
+
+-- Range of a for loop
+data Range = Range { start :: Int, end :: Int, step :: Int }
+
+-- Convenience function that errors on bad ranges
+mkRange :: Int -> Int -> Int -> Range
+mkRange start end step
+    | abs (end - start) >= step && step > 0 = Range start end step
+    | abs (end - start) >= (- step) && step < 0 = Range start end step
+    | otherwise = error [i| Bad loop bounds for(i = #{start}; i < #{end}; i = i + #{step})|]
+
+-- Control flow syntax
+data Control (term :: * -> *) (a :: *) where
+    For :: Range -> term Int -> Control term a -> Control term a
+    While :: term Bool -> Natural -> Control term a -> Control term a
+    If :: term Bool -> Control term a -> Control term a -> Control term a
+    One :: term a -> Control term a
+    Seq :: term b -> Control term a -> Control term a
+
+deriving instance Functor term => Functor (Control term)
+deriving instance Applicative term => Applicative (Control term)
+deriving instance Monad term => Monad (Control term)
+
+-- Convenience constructors
+forloop :: Range -> term Int -> Control term a -> Control term a
+forloop range iterator body = For range iterator body
+
+whileloop :: term Bool -> Natural -> Control term a -> Control term a
+whileloop check maxIterations body = While check maxIterations body
+
+ifstmt :: term Bool -> Control term a -> Control term a -> Control term a
+ifstmt check left right = If check left right
+
+-- Analysis state
+data LoopAnalysis a term = LoopAnalysis { stack :: [Control term a] }
+
+-- TODO: Implement analysis and loop flattening transformation
+loopAnalysis :: Control term a -> State (LoopAnalysis a term) (Control term a)
+loopAnalysis = undefined
+
+loopFlatten :: Control term a -> Control term a
+loopFlatten top = undefined
+
+

stack.yaml

@@ -53,9 +53,10 @@ extra-deps:
   - ghc-typelits-natnormalise-0.7.2@sha256:0fc48a3744aa25e5e53a054a8bb1fe6410752e497f446d75db9bd67bb258d05e,3495
   - integer-roots-1.0@sha256:5ea7ecb80633fb05a8a36acd40e9da6fe22a6cef320b1310cb9f0330801ac124,2271
   - mod-0.1.2.0@sha256:4c331986c46808d89da590d791841f046509041c849c4254b0872c72284f73ad,2202
+  - natural-numbers-0.1.2.0@sha256:0fcbe1220979b83fa612fca73a1adb1a99ff43c84f9652b3ff32b2323309b43c,1407
   - poly-0.4.0.0@sha256:75c243113712745dab5d2f4a52643705e146473770af212f9e0ce3d87a83f2ed,2123
   - semirings-0.5.4@sha256:5bd49c52a22c876c93d030cafa96b1233e9e7c42dacbe9f49686574368578c9c,2998
-
+  - string-interpolate-0.3.0.2@sha256:0102ed1eac13b7f85c6d2d3da764ad178d98a23d74912f5d2898eb54af624651,4022
 # Override default flag values for local packages and extra-deps
 # flags: {}
 

stack.yaml.lock

@@ -78,6 +78,13 @@ packages:
       sha256: e98a21bc2bdaba7dfba0aeb33d7b2ed5472cd496aea38098b40bac665171cefb
   original:
     hackage: mod-0.1.2.0@sha256:4c331986c46808d89da590d791841f046509041c849c4254b0872c72284f73ad,2202
+- completed:
+    hackage: natural-numbers-0.1.2.0@sha256:0fcbe1220979b83fa612fca73a1adb1a99ff43c84f9652b3ff32b2323309b43c,1407
+    pantry-tree:
+      size: 220
+      sha256: bd4beb677280f4586265c5657ab4e4a599c16f9e624df43d8edda6bf1e46dcdf
+  original:
+    hackage: natural-numbers-0.1.2.0@sha256:0fcbe1220979b83fa612fca73a1adb1a99ff43c84f9652b3ff32b2323309b43c,1407
 - completed:
     hackage: poly-0.4.0.0@sha256:75c243113712745dab5d2f4a52643705e146473770af212f9e0ce3d87a83f2ed,2123
     pantry-tree:
@@ -92,6 +99,13 @@ packages:
       sha256: 83e891acded173adc21b1bcce537f70f82d4b835fb42a41838ddf58d7bde7c7b
   original:
     hackage: semirings-0.5.4@sha256:5bd49c52a22c876c93d030cafa96b1233e9e7c42dacbe9f49686574368578c9c,2998
+- completed:
+    hackage: string-interpolate-0.3.0.2@sha256:0102ed1eac13b7f85c6d2d3da764ad178d98a23d74912f5d2898eb54af624651,4022
+    pantry-tree:
+      size: 1002
+      sha256: 073892b62ecdbee3138c572ede59b223433ac56795af96d2b18885de23b82f96
+  original:
+    hackage: string-interpolate-0.3.0.2@sha256:0102ed1eac13b7f85c6d2d3da764ad178d98a23d74912f5d2898eb54af624651,4022
 snapshots:
 - completed:
     size: 524996