Unfinished line parsing

klish/kpargv.h

@@ -34,7 +34,7 @@ void kpargv_free(kpargv_t *pargv);
 faux_list_t *kpargv_pargs(const kpargv_t *pargv);
 ssize_t kpargv_pargs_len(const kpargv_t *pargv);
 bool_t kpargv_pargs_is_empty(const kpargv_t *pargv);
-bool_t kpargv_pargs_add(kpargv_t *pargv, kparg_t *parg);
+bool_t kpargv_add_parg(kpargv_t *pargv, kparg_t *parg);
 kparg_t *kpargv_pargs_last(const kpargv_t *pargv);
 
 C_DECL_END

klish/ksession/ksession_parse.c

@@ -13,33 +13,98 @@
 #include <klish/kpargv.h>
 #include <klish/ksession.h>
 
+typedef enum {
+	KPARSE_NONE,
+	KPARSE_OK,
+	KPARSE_INPROGRESS,
+	KPARSE_NOTFOUND,
+	KPARSE_INCOMPLETED,
+	KPARSE_ILLEGAL,
+	KPARSE_ERROR,
+} kparse_status_e;
 
-static bool_t ksession_parse_arg(kentry_t *current_entry,
+
+static bool_t ksession_validate_arg(kentry_t *entry, const char *arg)
+{
+	assert(entry);
+	if (!entry)
+		return BOOL_FALSE;
+	assert(arg);
+	if (!arg)
+		return BOOL_FALSE;
+
+
+	return BOOL_FALSE;
+}
+
+
+static kparse_status_e ksession_parse_arg(kentry_t *current_entry,
 	faux_argv_node_t **argv_iter, kpargv_t *pargv)
 {
+	kentry_t *entry = current_entry;
+	kentry_mode_e mode = KENTRY_MODE_NONE;
+	kparse_status_e retcode = KPARSE_NONE;
+
 	assert(current_entry);
 	if (!current_entry)
-		return BOOL_FALSE;
+		return KPARSE_ERROR;
 	assert(argv_iter);
 	if (!argv_iter)
-		return BOOL_FALSE;
+		return KPARSE_ERROR;
 	assert(*argv_iter);
 	if (!*argv_iter)
-		return BOOL_FALSE;
+		return KPARSE_ERROR;
 	assert(pargv);
 	if (!pargv)
-		return BOOL_FALSE;
+		return KPARSE_ERROR;
 
 	// Is entry candidate to resolve current arg?
-	// Which entries can't be a candidate:
-	// * container
-	if (!kentry_container(current_entry)) {
+	// Container can't be a candidate.
+	if (!kentry_container(entry)) {
 		const char *current_arg = faux_argv_current(*argv_iter);
+		if (ksession_validate_arg(entry, current_arg)) {
+			kparg_t *parg = kparg_new(entry, current_arg);
+			kpargv_add_parg(pargv, parg);
+			faux_argv_each(argv_iter); // Next argument
+			retcode = KPARSE_INPROGRESS;
+		} else {
+			// It's not a container and is not validated so
+			// no chance to find anything here.
+			return KPARSE_NOTFOUND;
+		}
+	}
+
+	// Walk through the nested entries
+	mode = kentry_mode(entry);
+	if (KENTRY_MODE_EMPTY == mode)
+		return retcode;
 
-		current_arg = current_arg;
+	// SWITCH
+	// Entries within SWITCH can't has 'min'/'max' else than 1.
+	// So these attributes will be ignored. Note SWITCH itself can have
+	// 'min'/'max'.
+	if (KENTRY_MODE_SWITCH == mode) {
+		kentry_entrys_node_t *iter = kentry_entrys_iter(entry);
+		kentry_t *nested = NULL;
+		while ((nested = kentry_entrys_each(&iter))) {
+			if (ksession_parse_arg(nested, argv_iter, pargv)) {
+				retcode = KPARSE_INPROGRESS;
+				break;
+			}
+		}
+
+	// SEQUENCE
+	} else if (KENTRY_MODE_SEQUENCE == mode) {
+		kentry_entrys_node_t *iter = kentry_entrys_iter(entry);
+		kentry_t *nested = NULL;
+		while ((nested = kentry_entrys_each(&iter))) {
+			if (ksession_parse_arg(nested, argv_iter, pargv))
+				retcode = KPARSE_INPROGRESS;
+		}
+	
 	}
 
-	return BOOL_FALSE;
+	return retcode;
 }