Просмотр исходного кода

ncd: NCDValueParser: remove the NCDValue interface, leaving only the NCDVal interface

ambrop7 13 лет назад
Родитель
Сommit
5558252ce5
3 измененных файлов с 1 добавлено и 36 удалено
  1. 1 1
      ncd/CMakeLists.txt
  2. 0 27
      ncd/NCDValueParser.c
  3. 0 8
      ncd/NCDValueParser.h

+ 1 - 1
ncd/CMakeLists.txt

@@ -48,7 +48,7 @@ target_link_libraries(ncdvaluegenerator base ncdvalue ncdval)
 add_library(ncdvalueparser
     NCDValueParser.c
 )
-target_link_libraries(ncdvalueparser base ncdvalue ncdval ncdtokenizer ncdvalcompat ncdvalcons)
+target_link_libraries(ncdvalueparser base ncdval ncdtokenizer ncdvalcons)
 
 add_library(ncdast
     NCDAst.c

+ 0 - 27
ncd/NCDValueParser.c

@@ -33,7 +33,6 @@
 
 #include <base/BLog.h>
 #include <ncd/NCDConfigTokenizer.h>
-#include <ncd/NCDValCompat.h>
 #include <ncd/NCDValCons.h>
 
 #include "NCDValueParser.h"
@@ -216,29 +215,3 @@ fail1:
 fail0:
     return ret;
 }
-
-int NCDValueParser_Parse (const char *str, size_t str_len, NCDValue *out_value)
-{
-    ASSERT(str_len == 0 || str)
-    ASSERT(out_value)
-    
-    int res = 0;
-    
-    NCDValMem mem;
-    NCDValMem_Init(&mem);
-    
-    NCDValRef val;
-    if (!NCDValParser_Parse(str, str_len, &mem, &val)) {
-        goto fail;
-    }
-    
-    if (!NCDValCompat_ValToValue(val, out_value)) {
-        goto fail;
-    }
-    
-    res = 1;
-    
-fail:
-    NCDValMem_Free(&mem);
-    return res;
-}

+ 0 - 8
ncd/NCDValueParser.h

@@ -33,7 +33,6 @@
 #include <stddef.h>
 
 #include <misc/debug.h>
-#include <ncd/NCDValue.h>
 #include <ncd/NCDVal.h>
 
 /**
@@ -48,11 +47,4 @@
  */
 int NCDValParser_Parse (const char *str, size_t str_len, NCDValMem *mem, NCDValRef *out_value) WARN_UNUSED;
 
-/**
- * Parses an NCD value string into the old {@link NCDValue} representation.
- * This is just a wrapper around {@link NCDValParser_Parse} and
- * {@link NCDValCompat_ValToValue}.
- */
-int NCDValueParser_Parse (const char *str, size_t str_len, NCDValue *out_value) WARN_UNUSED;
-
 #endif