f713dc11ffa1 — Chris Cannam 5 years ago
Update for new developments in subrepos
4 files changed, 11 insertions(+), 11 deletions(-)

M repoint-lock.json
M repoint-project.json
M src/parse-serialise/prefix-table.sml
M src/store/index.sml
M repoint-lock.json +4 -4
@@ 1,19 1,19 @@ 
 {
   "libraries": {
     "sml-smlnj-containers": {
-      "pin": "a3020aba4db0"
+      "pin": "2c094258f541"
     },
     "sml-utf8": {
-      "pin": "715b45585896"
+      "pin": "cc9c7ce6eeec"
     },
     "sml-trie": {
-      "pin": "ccac4c1e0b66"
+      "pin": "f9cacb07c1a8"
     },
     "sml-log": {
       "pin": "eb568f7d3c13"
     },
     "sml-buildscripts": {
-      "pin": "dea0507a738f"
+      "pin": "c0ab93f4abde"
     }
   }
 }

          
M repoint-project.json +2 -4
@@ 11,14 11,12 @@ 
         "sml-utf8": {
             "vcs": "hg",
             "service": "bitbucket",
-	    "owner": "cannam",
-            "branch": "stream"
+	    "owner": "cannam"
         },
         "sml-trie": {
             "vcs": "hg",
             "service": "bitbucket",
-	    "owner": "cannam",
-            "branch": "twig"
+	    "owner": "cannam"
         },
         "sml-log": {
             "vcs": "hg",

          
M src/parse-serialise/prefix-table.sml +4 -2
@@ 64,7 64,7 @@ structure PrefixTable :> PREFIX_TABLE = 
                                        val compare = Iri.compare
                                        end)
 
-    type t = iri AbbrMap.map * abbreviation IriMap.map * IriTrie.t
+    type t = iri AbbrMap.map * abbreviation IriMap.map * IriTrie.trie
                         
     val empty : t = (AbbrMap.empty, IriMap.empty, IriTrie.empty)
 

          
@@ 120,7 120,9 @@ structure PrefixTable :> PREFIX_TABLE = 
 	  then NONE
 	  else
 	      case IriMap.find (reverse, prefix) of
-		  NONE => raise Fail ("internal error: prefix found in trie " ^
+		  NONE => raise Fail ("internal error: prefix <" ^
+                                      Iri.toString prefix ^
+                                      "> found in trie " ^
                                       "but not in reverse map")
 		| SOME abbr =>
 	          SOME (abbr, toUtf8 (dropPrefix (iri, Iri.size prefix)))

          
M src/store/index.sml +1 -1
@@ 14,7 14,7 @@ structure Index :> INDEX = struct
                                       val compare = RdfNode.compare
                                       end)
 
-    type t = indexOrder * NodeTrie.t
+    type t = indexOrder * NodeTrie.trie
 
     fun nameOfOrder SPO = "spo" 
       | nameOfOrder POS = "pos"