Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
curry
curry-tools
Commits
d79e0f17
Commit
d79e0f17
authored
Apr 04, 2018
by
Michael Hanus
Browse files
cpm updated
parent
3805365b
Changes
5
Hide whitespace changes
Inline
Side-by-side
cpm/src/CPM/Main.curry
View file @
d79e0f17
...
...
@@ -54,7 +54,7 @@ cpmBanner :: String
cpmBanner = unlines [bannerLine,bannerText,bannerLine]
where
bannerText =
"Curry Package Manager <curry-language.org/tools/cpm> (version of
29
/0
3
/2018)"
"Curry Package Manager <curry-language.org/tools/cpm> (version of
04
/0
4
/2018)"
bannerLine = take (length bannerText) (repeat '-')
main :: IO ()
...
...
cpm/src/CPM/Repository/Select.curry
View file @
d79e0f17
...
...
@@ -2,7 +2,7 @@
--- Some queries on the repository cache.
---
--- @author Michael Hanus
--- @version
March
2018
--- @version
April
2018
------------------------------------------------------------------------------
...
...
@@ -271,12 +271,14 @@ addPackageToRepositoryCache cfg pkg = do
updatePackageInRepositoryCache :: Config -> Package -> IO (ErrorLogger ())
updatePackageInRepositoryCache cfg pkg = do
dbexists <- doesFileExist (repositoryCacheDB cfg)
if dbexists then removePackageFromRepositoryDB pkg >>
if dbexists then removePackageFromRepositoryDB
cfg
pkg >>
addPackagesToRepositoryDB cfg True [pkg]
else cleanRepositoryCache cfg >> succeedIO ()
where
removePackageFromRepositoryDB pkg = runQuery cfg
(Database.CDBI.ER.deleteEntries CPM.Repository.RepositoryDB.indexEntry_CDBI_Description (Just (Database.CDBI.ER.And [Database.CDBI.ER.equal (Database.CDBI.ER.colNum CPM.Repository.RepositoryDB.indexEntryColumnName 0) (Database.CDBI.ER.string (name pkg)) ,Database.CDBI.ER.equal (Database.CDBI.ER.colNum CPM.Repository.RepositoryDB.indexEntryColumnVersion 0) (Database.CDBI.ER.string (showTerm (version pkg)))])))
--- Removes a package from the repository cache DB.
removePackageFromRepositoryDB :: Config -> Package -> IO ()
removePackageFromRepositoryDB cfg pkg = runQuery cfg
(Database.CDBI.ER.deleteEntries CPM.Repository.RepositoryDB.indexEntry_CDBI_Description (Just (Database.CDBI.ER.And [Database.CDBI.ER.equal (Database.CDBI.ER.colNum CPM.Repository.RepositoryDB.indexEntryColumnName 0) (Database.CDBI.ER.string (name pkg)) ,Database.CDBI.ER.equal (Database.CDBI.ER.colNum CPM.Repository.RepositoryDB.indexEntryColumnVersion 0) (Database.CDBI.ER.string (showTerm (version pkg)))])))
...
...
cpm/src/CPM/Repository/Select_ORG.curry
View file @
d79e0f17
...
...
@@ -2,7 +2,7 @@
--- Some queries on the repository cache.
---
--- @author Michael Hanus
--- @version
March
2018
--- @version
April
2018
------------------------------------------------------------------------------
{-# OPTIONS_CYMAKE -F --pgmF=currypp --optF=foreigncode --optF=-o #-}
...
...
@@ -271,13 +271,15 @@ addPackageToRepositoryCache cfg pkg = do
updatePackageInRepositoryCache :: Config -> Package -> IO (ErrorLogger ())
updatePackageInRepositoryCache cfg pkg = do
dbexists <- doesFileExist (repositoryCacheDB cfg)
if dbexists then removePackageFromRepositoryDB pkg >>
if dbexists then removePackageFromRepositoryDB
cfg
pkg >>
addPackagesToRepositoryDB cfg True [pkg]
else cleanRepositoryCache cfg >> succeedIO ()
where
removePackageFromRepositoryDB pkg = runQuery cfg
``sql* Delete
From IndexEntry
Where Name = {name pkg} And Version = {showTerm (version pkg)};''
--- Removes a package from the repository cache DB.
removePackageFromRepositoryDB :: Config -> Package -> IO ()
removePackageFromRepositoryDB cfg pkg = runQuery cfg
``sql* Delete
From IndexEntry
Where Name = {name pkg} And Version = {showTerm (version pkg)};''
------------------------------------------------------------------------------
cpm/vendor/xml/src/XML.curry
View file @
d79e0f17
...
...
@@ -279,7 +279,8 @@ parseXmlString s = fst (parseXmlTokens (scanXmlString s) Nothing)
-- parse a list of XML tokens into list of XML expressions:
-- parseXmlTokens tokens stoptoken = (xml_expressions, remaining_tokens)
parseXmlTokens :: [XmlExp] -> Maybe String -> ([XmlExp],[XmlExp])
parseXmlTokens [] Nothing = ([],[])
parseXmlTokens [] Nothing = ([],[])
parseXmlTokens [] (Just _) = error "XML.parseXmlTokens: incomplete parse"
parseXmlTokens (XText s : xtokens) stop =
let (xexps, rem_xtokens) = parseXmlTokens xtokens stop
in (XText (xmlUnquoteSpecials s) : xexps, rem_xtokens)
...
...
@@ -295,6 +296,8 @@ parseXmlTokens (XElem (t:ts) args cont : xtokens) stop
in (XElem ts args cont : xexps, rem_xtokens)
| otherwise = let (xexps, rem_xtokens) = parseXmlTokens xtokens stop
in (XElem (t:ts) args cont : xexps, rem_xtokens)
parseXmlTokens (XElem [] _ _ : _) _ =
error "XML.parseXmlTokens: incomplete parse"
-- scan an XML string into list of XML tokens:
...
...
optimize/.cpm/packages/xml/src/XML.curry
View file @
d79e0f17
...
...
@@ -279,7 +279,8 @@ parseXmlString s = fst (parseXmlTokens (scanXmlString s) Nothing)
-- parse a list of XML tokens into list of XML expressions:
-- parseXmlTokens tokens stoptoken = (xml_expressions, remaining_tokens)
parseXmlTokens :: [XmlExp] -> Maybe String -> ([XmlExp],[XmlExp])
parseXmlTokens [] Nothing = ([],[])
parseXmlTokens [] Nothing = ([],[])
parseXmlTokens [] (Just _) = error "XML.parseXmlTokens: incomplete parse"
parseXmlTokens (XText s : xtokens) stop =
let (xexps, rem_xtokens) = parseXmlTokens xtokens stop
in (XText (xmlUnquoteSpecials s) : xexps, rem_xtokens)
...
...
@@ -295,6 +296,8 @@ parseXmlTokens (XElem (t:ts) args cont : xtokens) stop
in (XElem ts args cont : xexps, rem_xtokens)
| otherwise = let (xexps, rem_xtokens) = parseXmlTokens xtokens stop
in (XElem (t:ts) args cont : xexps, rem_xtokens)
parseXmlTokens (XElem [] _ _ : _) _ =
error "XML.parseXmlTokens: incomplete parse"
-- scan an XML string into list of XML tokens:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment