diff options
| author | Inari Listenmaa <inari.listenmaa@gmail.com> | 2021-07-06 14:05:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 14:05:00 +0200 |
| commit | 5e052ff4997a407f6e97fd7ce97aa3911cd78157 (patch) | |
| tree | 106d4ff2a5b4548f3bea6a83ffcc9b8664b2f179 /src/compiler/GF/Command | |
| parent | 1b66bf2773b0feda528d3b22fbaf06227a51b864 (diff) | |
| parent | d2fb755fab8b9ba2dcde20d2854b1f90fb8c2f76 (diff) | |
Merge pull request #119 from GrammaticalFramework/concrete-new
Clean up Compute.ConcreteNew and TypeCheck.RConcrete
Diffstat (limited to 'src/compiler/GF/Command')
| -rw-r--r-- | src/compiler/GF/Command/SourceCommands.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/GF/Command/SourceCommands.hs b/src/compiler/GF/Command/SourceCommands.hs index 0ba60d245..91ada899d 100644 --- a/src/compiler/GF/Command/SourceCommands.hs +++ b/src/compiler/GF/Command/SourceCommands.hs @@ -18,8 +18,8 @@ import GF.Grammar.Parser (runP, pExp) import GF.Grammar.ShowTerm import GF.Grammar.Lookup (allOpers,allOpersTo) import GF.Compile.Rename(renameSourceTerm) -import qualified GF.Compile.Compute.ConcreteNew as CN(normalForm,resourceValues) -import GF.Compile.TypeCheck.RConcrete as TC(inferLType,ppType) +import GF.Compile.Compute.Concrete(normalForm,resourceValues) +import GF.Compile.TypeCheck.Concrete as TC(inferLType,ppType) import GF.Infra.Dependencies(depGraph) import GF.Infra.CheckM(runCheck) @@ -259,7 +259,7 @@ checkComputeTerm os sgr t = ((t,_),_) <- runCheck $ do t <- renameSourceTerm sgr mo t inferLType sgr [] t let opts = modifyFlags (\fs->fs{optTrace=isOpt "trace" os}) - t1 = CN.normalForm (CN.resourceValues opts sgr) (L NoLoc identW) t + t1 = normalForm (resourceValues opts sgr) (L NoLoc identW) t t2 = evalStr t1 checkPredefError t2 where |