ruby_rnv 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f815e167e18653e6820b447245834127448b9ac2b72c2f0228baefb40226007d
-  data.tar.gz: d192a9e1faa7e62c25caf68fca1beaeb7a77f706a85ecf50175f70c5e4dd45f4
+  metadata.gz: 899300861f1a2b315f879d451a7a5ee472302fbdac26ea775a2e56e09793d98c
+  data.tar.gz: 4f2139ddde96c34a077e124600bb7cbbb0e98ef5db5fe5c57066bdcc8fd4c089
 SHA512:
-  metadata.gz: 9d53f3238103630b7617fe91850bd4ad930781981cc3d67cd8a5f1d9cfb4ff90d9de6463483e2ee054bce3cbeb19f6407edeb5dd91008b222a464a6bd7ab07d0
-  data.tar.gz: 3613bb75f3ef998a5a90af133fcbcc40b51a7bb983149bbcb8bae67e800a72c5a61978f26fb96aed8ec707d2ecbac2a4356fbe457382dbf85277be6638257074
+  metadata.gz: c9660b568d0a4fe092080bb095fd80125540ece28c669ecae73faa9391567a337fcd8799702b29bdcecd022b9613f76c3d9e6013f3c289000a5a98950bd67860
+  data.tar.gz: 63924d0755a95489733c62ccde564260750dcfea5e0a366e26d6663178b00e47d6ee095f18b8cee293c7c4eba457746a86cb9eedb696c7e63321449cbbf89536

data/ext/rnv/src/drv.c

@@ -381,7 +381,18 @@ static int text(rnv_t *rnv, rn_st_t *rn_st, rx_st_t *rx_st, drv_st_t *drv_st, in
     ret=rn_nullable(list(rnv, rn_st, rx_st, drv_st, p1,s,n))?rnv->rn_empty:rnv->rn_notAllowed;
     break;
   case RN_P_DATA: rn_Data(p,dt,ps); rn_Datatype(dt,lib,typ);
+    int i;
+    // avoid dtl called multiple times for same data
+    for(i = 0;i<drv_st->n_dtl_cb;i++) {
+      if(drv_st->dtl_cb[i].p == p)
+        ret = drv_st->dtl_cb[i].ret;
+    }
+    if(!ret) {
     ret=getdtl(rnv, drv_st, lib)->allows(rnv,rn_st,rx_st, lib, rnv->rn_string+typ,rnv->rn_string+ps,s,n)?rnv->rn_empty:rnv->rn_notAllowed;
+    drv_st->dtl_cb[drv_st->n_dtl_cb].p = p;
+    drv_st->dtl_cb[drv_st->n_dtl_cb].ret = ret;
+    drv_st->n_dtl_cb++;
+    }
     break;
   case RN_P_DATA_EXCEPT: rn_DataExcept(p,p1,p2);
     ret=text(rnv, rn_st, rx_st, drv_st, p1,s,n)==rnv->rn_empty&&!rn_nullable(text(rnv, rn_st, rx_st, drv_st, p2,s,n))?rnv->rn_empty:rnv->rn_notAllowed;
@@ -395,6 +406,7 @@ static int text(rnv_t *rnv, rn_st_t *rn_st, rx_st_t *rx_st, drv_st_t *drv_st, in
 }
 
 static int textws(rnv_t *rnv, rn_st_t *rn_st, rx_st_t *rx_st, drv_st_t *drv_st, int p,char *s,int n) {
+  drv_st->n_dtl_cb = 0;
   int p1=text(rnv, rn_st, rx_st, drv_st, p,s,n),ws=1;
   char *end=s+n;
   while(s!=end) {if(!xmlc_white_space(*s)) {ws=0; break;} ++s;}

data/ext/rnv/src/type.h

@@ -105,6 +105,12 @@ typedef struct rx_st
 
 } rx_st_t;
 
+typedef struct dtl_cb 
+{
+  int p;
+  int ret;
+} dtl_cb_t;
+
 typedef struct drv_st
 {
   struct dtl *dtl;
@@ -115,6 +121,9 @@ typedef struct drv_st
   struct hashtable ht_m;
   int (*memo)[5];
 
+  dtl_cb_t dtl_cb[256];
+  int n_dtl_cb;
+
   int drv_compact;
 
   int (*verror_handler)(void *data, int erno, char *format, va_list ap);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rnv
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler