scheme: Unfinished refactoring 2

klish/Makefile.am

@@ -36,10 +36,12 @@ nobase_include_HEADERS += \
 
 EXTRA_DIST += \
 	klish/ktp/Makefile.am \
+	klish/ischeme/Makefile.am \
 	klish/kscheme/Makefile.am \
 	klish/ksession/Makefile.am
 
 include $(top_srcdir)/klish/ktp/Makefile.am
+include $(top_srcdir)/klish/ischeme/Makefile.am
 include $(top_srcdir)/klish/kscheme/Makefile.am
 include $(top_srcdir)/klish/ksession/Makefile.am
 

klish/ischeme/Makefile.am

@@ -1,8 +1,8 @@
 libklish_la_SOURCES += \
-	klish/kscheme/ischeme.c \
-	klish/kscheme/iptype.c \
-	klish/kscheme/iaction.c \
-	klish/kscheme/iview.c \
-	klish/kscheme/icommand.c \
-	klish/kscheme/iparam.c \
-	klish/kscheme/iplugin.c
+	klish/ischeme/ischeme.c \
+	klish/ischeme/iptype.c \
+	klish/ischeme/iaction.c \
+	klish/ischeme/iview.c \
+	klish/ischeme/icommand.c \
+	klish/ischeme/iparam.c \
+	klish/ischeme/iplugin.c

klish/kcommand.h

@@ -12,13 +12,6 @@
 
 typedef struct kcommand_s kcommand_t;
 
-typedef struct icommand_s {
-	char *name;
-	char *help;
-	iparam_t * (*params)[];
-	iaction_t * (*actions)[];
-} icommand_t;
-
 typedef enum {
 	KCOMMAND_ERROR_OK,
 	KCOMMAND_ERROR_INTERNAL,
@@ -29,10 +22,6 @@ typedef enum {
 
 C_DECL_BEGIN
 
-// icommand_t
-char *icommand_to_text(const icommand_t *icommand, int level);
-
-// kcommand_t
 kcommand_t *kcommand_new(const icommand_t *info, kcommand_error_e *error);
 void kcommand_free(kcommand_t *command);
 const char *kcommand_strerror(kcommand_error_e error);

klish/kscheme.h

@@ -10,7 +10,7 @@
 
 #include <klish/ischeme.h>
 #include <klish/kplugin.h>
-#include <klish/kaction.h>
+#include <klish/kptype.h>
 #include <klish/kview.h>
 
 typedef struct kscheme_s kscheme_t;