Merge in code changes for all of the new parser.

[m6w6/libmemcached] / libmemcached / options.cc

diff --git a/libmemcached/options.cc b/libmemcached/options.cc
index 5a9feacb8754920113c6b339ecc99c8f5482878a..02b885fca60e69e6f6efd54c1bea381c874c352b 100644 (file)
--- a/libmemcached/options.cc
+++ b/libmemcached/options.cc
@@ -37,41 +37,31 @@
 
 #include "common.h"
 
-#include <libmemcached/options/parser.h>
-#include <libmemcached/options/scanner.h>
+#include <iostream>
 
-int libmemcached_parse(type_st *, yyscan_t *);
+#include <libmemcached/options/context.h>
 
-memcached_return_t memcached_parse_options(memcached_st *self, char const *option_string, size_t length)
+const char *memcached_parse_filename(memcached_st *memc)
 {
-  type_st pp;
-
-  memset(&pp, 0, sizeof(type_st));
-
-  WATCHPOINT_ASSERT(self);
-  if (! self)
-    return MEMCACHED_INVALID_ARGUMENTS;
-
-  pp.buf= option_string;
-  pp.memc= self;
-  pp.length= length;
-  libmemcached_lex_init(&pp.yyscanner);
-  libmemcached_set_extra(&pp, pp.yyscanner);
-  bool success= libmemcached_parse(&pp, pp.yyscanner)  == 0;
-  libmemcached_lex_destroy(pp.yyscanner);
-
-  if (not success)
-    return MEMCACHED_INVALID_ARGUMENTS;
+  return memcached_array_string(memc->configure.filename);
+}
 
-  return MEMCACHED_SUCCESS;
+size_t memcached_parse_filename_length(memcached_st *memc)
+{
+  return memcached_array_size(memc->configure.filename);
 }
 
-memcached_return_t memcached_parse_file_options(memcached_st *self, const char *filename)
+static memcached_return_t _parse_file_options(memcached_st *self, memcached_string_t *filename)
 {
-  FILE *fp= fopen(filename, "r");
-  
+  std::string real_name(filename->c_str, filename->size);
+  FILE *fp= fopen(real_name.c_str(), "r");
   if (! fp)
-    return memcached_set_errno(self, errno, NULL);
+  {
+    memcached_string_t tmp;
+    tmp.c_str= real_name.c_str();
+    tmp.size= real_name.size();
+    return memcached_set_errno(self, errno, &tmp);
+  }
 
   char buffer[BUFSIZ];
   memcached_return_t rc= MEMCACHED_INVALID_ARGUMENTS;
@@ -82,8 +72,7 @@ memcached_return_t memcached_parse_file_options(memcached_st *self, const char *
     if (length == 1 and buffer[0] == '\n')
       continue;
 
-    rc= memcached_parse_options(self, buffer, length);
-
+    rc= memcached_parse_configuration(self, buffer, length);
     if (rc != MEMCACHED_SUCCESS)
       break;
   }
@@ -91,3 +80,67 @@ memcached_return_t memcached_parse_file_options(memcached_st *self, const char *
 
   return rc;
 }
+
+memcached_return_t libmemcached_check_configuration(const char *option_string, size_t length, char *error_buffer, size_t error_buffer_size)
+{
+  memcached_st memc, *memc_ptr;
+
+  if (! (memc_ptr= memcached_create(&memc)))
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+  memcached_return_t rc= memcached_parse_configuration(memc_ptr, option_string, length);
+  if (rc != MEMCACHED_SUCCESS && error_buffer && error_buffer_size)
+  {
+    strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
+  }
+
+  if (rc== MEMCACHED_SUCCESS && memcached_behavior_get(memc_ptr, MEMCACHED_BEHAVIOR_LOAD_FROM_FILE))
+  {
+    memcached_string_t filename= memcached_array_to_string(memc_ptr->configure.filename);
+    rc= _parse_file_options(memc_ptr, &filename);
+
+    if (rc != MEMCACHED_SUCCESS && error_buffer && error_buffer_size)
+    {
+      strncpy(error_buffer, memcached_last_error_message(memc_ptr), error_buffer_size);
+    }
+  }
+
+  memcached_free(memc_ptr);
+
+  return rc;
+}
+
+memcached_return_t memcached_parse_configuration(memcached_st *self, char const *option_string, size_t length)
+{
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+
+  memcached_return_t rc;
+  Context context(option_string, length, self, rc);
+
+  context.start();
+
+  return rc;
+}
+
+void memcached_set_configuration_file(memcached_st *self, const char *filename, size_t filename_length)
+{
+  memcached_array_free(self->configure.filename);
+  self->configure.filename= memcached_strcpy(self, filename, filename_length);
+}
+
+memcached_return_t memcached_parse_configure_file(memcached_st *self, const char *filename, size_t filename_length)
+{
+  if (! self)
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+
+  if (! filename || filename_length == 0)
+    return memcached_set_error(self, MEMCACHED_INVALID_ARGUMENTS, NULL);
+  
+  memcached_string_t tmp;
+  tmp.c_str= filename;
+  tmp.size= filename_length;
+
+  return _parse_file_options(self, &tmp);
+}