Verified Commit 3aa2973e authored by Camil Staps's avatar Camil Staps 🚀

Adapt for new hierarchy

parent d3785b6d
definition module BuiltinABCInstructions
definition module Builtin.ABC
from CloogleDB import :: ABCInstructionEntry
from Cloogle.DB import :: ABCInstructionEntry
builtin_abc_instructions :: [ABCInstructionEntry]
implementation module BuiltinABCInstructions
implementation module Builtin.ABC
import _SystemArray
import StdList
......@@ -6,9 +6,8 @@ import StdMisc
import Text
import Cloogle
import CloogleDB
import Cloogle.API
import Cloogle.DB
builtin_abc_instructions :: [ABCInstructionEntry]
builtin_abc_instructions =
......
definition module Builtins
definition module Builtin.Predef
from CloogleDB import :: FunctionEntry, :: ClassEntry, :: TypeDefEntry,
from Cloogle.DB import :: FunctionEntry, :: ClassEntry, :: TypeDefEntry,
:: CleanLangReportLocation
CLR :: Int String String -> CleanLangReportLocation
......
implementation module Builtins
implementation module Builtin.Predef
import StdBool
import StdEnum
......@@ -12,11 +12,11 @@ import Data.List
import Data.Maybe
import Text
import Type
import Clean.Doc
import Clean.Types
import Cloogle
import Doc
import CloogleDB
import Cloogle.API
import Cloogle.DB
CLR :: Int String String -> CleanLangReportLocation
CLR f sec h =
......
definition module BuiltinSyntax
definition module Builtin.Syntax
from CloogleDB import :: SyntaxEntry
from Cloogle.DB import :: SyntaxEntry
builtin_syntax :: [SyntaxEntry]
implementation module BuiltinSyntax
implementation module Builtin.Syntax
import StdList
......@@ -6,11 +6,10 @@ from Data.Func import $
import Data.Maybe
import Text
import Cloogle
import Cloogle.API
import Cloogle.DB
import CloogleDB
import Builtins
import Builtin.Predef
builtin_syntax :: [SyntaxEntry]
builtin_syntax =
......
Subproject commit 00b4e563da95396c1f8373b846b60be75caa4c28
Subproject commit 1ae8eaa92f46af218a049fd9ddf1154032d94e6a
......@@ -29,14 +29,18 @@ import System.Time
from Text import class Text(concat,toLowerCase), instance Text String, <+
import Text.GenJSON
import Cloogle
import Type
import CloogleDB
import Search
import Clean.Types
import Clean.Types.Parse
import Clean.Types.Unify
import Clean.Types.Util
import SimpleTCPServer
import Cache
import Memory
import Cloogle.API
import Cloogle.DB
import Cloogle.Search
import Util.SimpleTCPServer
import Util.Cache
import Util.Memory
MAX_RESULTS :== 15
CACHE_PREFETCH :== 5
......
......@@ -5,7 +5,7 @@ COPY libs.json /usr/src/cloogle/libs.json
COPY util/fetch_libs.sh /usr/src/cloogle/fetch_libs.sh
WORKDIR /usr/src/cloogle
RUN install_clean.sh bundle-complete 2018-04-26 \
RUN install_clean.sh bundle-complete 2018-05-19 \
&& PACKAGES="patch jq" \
&& apt-get update -qq\
&& apt-get install -qq $PACKAGES --no-install-recommends\
......
......@@ -10,7 +10,7 @@ CLMFLAGS:=-h 250M -nr -nt -nortsopts\
-I $$CLEAN_HOME/lib/Platform/Deprecated/StdLib\
-I Cloogle\
-I Cloogle/libcloogle\
-I Cloogle/CleanTypeUnifier\
-I Cloogle/CleanTypes\
-I Cloogle/CleanPrettyPrint
ifeq "$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)" "1"
CLMFLAGS+=-l -no-pie
......@@ -27,8 +27,8 @@ man: $(MAN)
CloogleServer:
$(CLM) $(CLMFLAGS) $@ -o $@
shopt -s globstar
touch **/*.[di]cl
#shopt -s globstar
#touch **/*.[di]cl
$(CLM) $(CLMFLAGS) $@ -o $@
builddb: Cloogle/clean-compiler
......
definition module Cache
definition module Util.Cache
from StdOverloaded import class toString
from Data.Maybe import :: Maybe
......
implementation module Cache
implementation module Util.Cache
import StdFile
import StdFunc
......
definition module Memory
definition module Util.Memory
MCL_CURRENT :== 1
MCL_FUTURE :== 2
......
implementation module Memory
implementation module Util.Memory
import StdInt
......
definition module SimpleTCPServer
definition module Util.SimpleTCPServer
from StdOverloaded import class zero, class fromString, class toString
from StdMaybe import :: Maybe
......
implementation module SimpleTCPServer
implementation module Util.SimpleTCPServer
import StdEnv
import Data.Maybe
......
......@@ -3,7 +3,7 @@ module builddb
import StdArray
import StdBool
import StdFile
from StdFunc import const, id, o
from StdFunc import const, flip, id, o
import StdList
import StdMisc
import StdString
......@@ -21,15 +21,15 @@ import System.File
from Text import class Text(join,startsWith), instance Text String
import Text.GenJSON
import CloogleDB
import Type
from CloogleDBFactory import :: TemporaryDB, newTemporaryDB, finaliseDB,
import Clean.Types
import Cloogle.DB
from Cloogle.DB.Factory import :: TemporaryDB, newTemporaryDB, finaliseDB,
findModules, indexModule, constructor_functions, record_functions,
:: IndexItem, :: SourceURL, :: PathPattern
import Builtins
import BuiltinSyntax
import BuiltinABCInstructions
import Builtin.ABC
import Builtin.Predef
import Builtin.Syntax
:: CLI =
{ help :: !Bool
......
......@@ -657,7 +657,7 @@ function getResults(str, libs, include_builtins, include_core, include_apps, pag
'<div class="result-extra">' +
meta.join('<br/>') +
'<br class="parbreak"/>' +
'<a href="https://github.com/clean-cloogle/cloogle.org/blob/master/backend/BuiltinSyntax.icl" target="_blank">Edit this explanation on GitHub.</a>' +
'<a href="https://github.com/clean-cloogle/cloogle.org/blob/master/backend/Builtin/Syntax.icl" target="_blank">Edit this explanation on GitHub.</a>' +
'</div>' +
'<div class="result-extra toggle-container">' +
toggler +
......@@ -674,7 +674,7 @@ function getResults(str, libs, include_builtins, include_core, include_apps, pag
': <code>' + extra['abc_instruction'] + '</code></div>' +
'<div class="result-extra">' +
meta.join('<br/>') +
'<a class="parbreak" href="https://github.com/clean-cloogle/cloogle.org/blob/master/backend/BuiltinABCInstructions.icl" target="_blank">Edit this explanation on GitHub.</a>' +
'<a class="parbreak" href="https://github.com/clean-cloogle/cloogle.org/blob/master/backend/Builtin/ABC.icl" target="_blank">Edit this explanation on GitHub.</a>' +
'</div>' +
'<pre class="result-code">' +
highlightFunction(line, null, line[0] == '.' ? 'abc' : 'abcInstruction') +
......
......@@ -108,9 +108,9 @@
"info_url": "https://github.com/camilstaps/CleanSnappy"
},
{
"name": "CleanTypeUnifier",
"fetch_url": ["Git", "https://github.com/clean-cloogle/CleanTypeUnifier"],
"info_url": "https://github.com/clean-cloogle/CleanTypeUnifier"
"name": "CleanTypes",
"fetch_url": ["Git", "https://github.com/clean-cloogle/CleanTypes"],
"info_url": "https://github.com/clean-cloogle/CleanTypes"
},
{
"name": "clean-compiler",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment