WIP: [Obsolete] Integration of requirements checker plugin

build.sh

@@ -25,6 +25,7 @@ run .  cabal_install --ghcjs ./codeworld-prediction \
                              ./codeworld-error-sanitizer \
                              ./codeworld-api \
                              ./codeworld-base \
+                             ./codeworld-requirements \
                              ./codeworld-game-api \
                              QuickCheck \
                              linear
@@ -52,7 +53,8 @@ run .  cabal_install ./codeworld-server \
                      ./codeworld-api \
                      ./codeworld-game-server \
                      ./codeworld-account \
-                     ./codeworld-auth
+                     ./codeworld-auth \
+                     -f build-plugin-for-ghcjs
 
 # Build the JavaScript client code for FunBlocks, the block-based UI.
 run .  cabal_install --ghcjs ./funblocks-client

codeworld-compiler/codeworld-compiler.cabal

@@ -33,12 +33,6 @@ Library
 
   Other-modules:
     CodeWorld.Compile.Framework
-    CodeWorld.Compile.Requirements
-    CodeWorld.Compile.Requirements.Eval
-    CodeWorld.Compile.Requirements.Language
-    CodeWorld.Compile.Requirements.LegacyLanguage
-    CodeWorld.Compile.Requirements.Matcher
-    CodeWorld.Compile.Requirements.Types
     CodeWorld.Compile.Stages
 
   Build-depends:
@@ -54,7 +48,7 @@ Library
     directory,
     exceptions,
     filepath,
-    ghc-lib-parser < 8.8,
+    ghc-lib-parser >= 0.20190603 && < 0.20190703,
     hashable,
     haskell-src-exts >= 1.20,
     megaparsec,

codeworld-compiler/src/CodeWorld/Compile.hs

@@ -86,8 +86,7 @@ compileSource stage src err mode verbose = fromMaybe CompileAborted <$>
         compileStatus = CompileSuccess,
         compileErrors = [],
         compileReadSource = Nothing,
-        compileParsedSource = Nothing,
-        compileGHCParsedSource = Nothing
+        compileParsedSource = Nothing
         }
     timeout = case stage of
         GenBase _ _ _ _ -> maxBound :: Int
@@ -101,7 +100,6 @@ build = do
     checkDangerousSource
     ifSucceeding checkCodeConventions
     ifSucceeding compileCode
-    ifSucceeding checkRequirements
 
     errPath <- gets compileOutputPath
     diags <- sort <$> gets compileErrors
@@ -152,6 +150,8 @@ buildArgs "codeworld" =
     , "base"
     , "-package"
     , "codeworld-base"
+    , "-fplugin"
+    , "CodeWorld.Requirements.RequirementsChecker"
     , "-Wall"
     , "-Wdeferred-type-errors"
     , "-Wdeferred-out-of-scope-variables"
@@ -200,6 +200,8 @@ buildArgs "haskell" =
     , "codeworld-api"
     , "-package"
     , "QuickCheck"
+    , "-fplugin"
+    , "CodeWorld.Requirements.RequirementsChecker"
     ]
 
 runCompiler :: FilePath -> Int -> [String] -> Bool -> IO (ExitCode, Text)

codeworld-compiler/src/CodeWorld/Compile/Framework.hs

@@ -320,4 +320,4 @@ srcSpanFor src off len =
         next (!n, !ln, !col) '\r' = (n - 1, ln, col)
         next (!n, !ln, !col) '\n' = (n - 1, ln + 1, 1)
         next (!n, !ln, !col) '\t' = (n - 1, ln, col + 8 - (col - 1) `mod` 8)
-        next (!n, !ln, !col) _    = (n - 1, ln, col + 1)
+        next (!n, !ln, !col) _    = (n - 1, ln, col + 1)