* Changed scss_dump_nodes interface.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2775 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/src/css/include/scss.h b/src/css/include/scss.h
index d3d3c3b..bae0e29 100644 (file)
--- a/src/css/include/scss.h
+++ b/src/css/include/scss.h
@@ -49,10 +49,10 @@ struct _SCSSDoc_t {
 /**
  * for DEBUG. dump Node tree.
  *
- * @param nowNode for dump node object.
+ * @param doc     for dump doc object.
  * @param level   please set 0.
  */
-extern void scss_dump_nodes(SCSSNodePtr_t nowNode, int level);
+extern void scss_dump_nodes(SCSSDocPtr_t doc);
 
 /**
  * CSS Parser.

diff --git a/src/css/src/Makefile b/src/css/src/Makefile
index 907ca28..6c2099e 100644 (file)
--- a/src/css/src/Makefile
+++ b/src/css/src/Makefile
@@ -53,7 +53,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libscss_la_LIBADD =
 am_libscss_la_OBJECTS = libscss_la-main.lo libscss_la-ignore_sp.lo \
-       libscss_la-starts_with.lo
+       libscss_la-starts_with.lo libscss_la-dump_nodes.lo
 libscss_la_OBJECTS = $(am_libscss_la_OBJECTS)
 libscss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscss_la_CFLAGS) \
@@ -191,7 +191,8 @@ top_builddir = ..
 top_srcdir = ..
 libscss_la_SOURCES = main.c \
   ignore_sp.c \
-  starts_with.c 
+  starts_with.c  \
+  dump_nodes.c
 
 libscss_la_CFLAGS = -O2 -prefer-pic -I. -I../include -I./serf
 AM_CFLAGS = -g -O2  -I/usr/include/apr-1.0   -pipe -Wall -g -O2 -pthread  -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE  -I/usr/include/apr-1.0 -I/usr/include/postgresql -O2 -prefer-pic -I. -I../include 
@@ -265,6 +266,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+include ./$(DEPDIR)/libscss_la-dump_nodes.Plo
 include ./$(DEPDIR)/libscss_la-ignore_sp.Plo
 include ./$(DEPDIR)/libscss_la-main.Plo
 include ./$(DEPDIR)/libscss_la-starts_with.Plo
@@ -311,6 +313,13 @@ libscss_la-starts_with.lo: starts_with.c
 #      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
 #      $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -c -o libscss_la-starts_with.lo `test -f 'starts_with.c' || echo '$(srcdir)/'`starts_with.c
 
+libscss_la-dump_nodes.lo: dump_nodes.c
+       $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -MT libscss_la-dump_nodes.lo -MD -MP -MF $(DEPDIR)/libscss_la-dump_nodes.Tpo -c -o libscss_la-dump_nodes.lo `test -f 'dump_nodes.c' || echo '$(srcdir)/'`dump_nodes.c
+       mv -f $(DEPDIR)/libscss_la-dump_nodes.Tpo $(DEPDIR)/libscss_la-dump_nodes.Plo
+#      source='dump_nodes.c' object='libscss_la-dump_nodes.lo' libtool=yes \
+#      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
+#      $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -c -o libscss_la-dump_nodes.lo `test -f 'dump_nodes.c' || echo '$(srcdir)/'`dump_nodes.c
+
 mostlyclean-libtool:
        -rm -f *.lo
 

diff --git a/src/css/src/Makefile.am b/src/css/src/Makefile.am
index 43d20db..2056b59 100644 (file)
--- a/src/css/src/Makefile.am
+++ b/src/css/src/Makefile.am
@@ -1,6 +1,7 @@
 libscss_la_SOURCES = main.c \
   ignore_sp.c \
-  starts_with.c 
+  starts_with.c  \
+  dump_nodes.c
 
 libscss_la_CFLAGS = -O2 -prefer-pic -I. -I../include -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic -I. -I../include 

diff --git a/src/css/src/Makefile.in b/src/css/src/Makefile.in
index 98a5d4c..5acbf7f 100644 (file)
--- a/src/css/src/Makefile.in
+++ b/src/css/src/Makefile.in
@@ -53,7 +53,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libscss_la_LIBADD =
 am_libscss_la_OBJECTS = libscss_la-main.lo libscss_la-ignore_sp.lo \
-       libscss_la-starts_with.lo
+       libscss_la-starts_with.lo libscss_la-dump_nodes.lo
 libscss_la_OBJECTS = $(am_libscss_la_OBJECTS)
 libscss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscss_la_CFLAGS) \
@@ -191,7 +191,8 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libscss_la_SOURCES = main.c \
   ignore_sp.c \
-  starts_with.c 
+  starts_with.c  \
+  dump_nodes.c
 
 libscss_la_CFLAGS = -O2 -prefer-pic -I. -I../include -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic -I. -I../include 
@@ -265,6 +266,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscss_la-dump_nodes.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscss_la-ignore_sp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscss_la-main.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscss_la-starts_with.Plo@am__quote@
@@ -311,6 +313,13 @@ libscss_la-starts_with.lo: starts_with.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -c -o libscss_la-starts_with.lo `test -f 'starts_with.c' || echo '$(srcdir)/'`starts_with.c
 
+libscss_la-dump_nodes.lo: dump_nodes.c
+@am__fastdepCC_TRUE@   $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -MT libscss_la-dump_nodes.lo -MD -MP -MF $(DEPDIR)/libscss_la-dump_nodes.Tpo -c -o libscss_la-dump_nodes.lo `test -f 'dump_nodes.c' || echo '$(srcdir)/'`dump_nodes.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/libscss_la-dump_nodes.Tpo $(DEPDIR)/libscss_la-dump_nodes.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='dump_nodes.c' object='libscss_la-dump_nodes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscss_la_CFLAGS) $(CFLAGS) -c -o libscss_la-dump_nodes.lo `test -f 'dump_nodes.c' || echo '$(srcdir)/'`dump_nodes.c
+
 mostlyclean-libtool:
        -rm -f *.lo
 

diff --git a/src/css/src/dump_nodes.c b/src/css/src/dump_nodes.c
new file mode 100644 (file)
index 0000000..6dd158e
--- /dev/null
+++ b/src/css/src/dump_nodes.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2008 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005 QSDN,Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "scss.h"
+#include <stdio.h>
+
+static void s_dump_nodes(SCSSNodePtr_t nowNode, int level);
+
+void
+scss_dump_nodes(SCSSDocPtr_t doc)
+{
+  s_dump_nodes(doc->rootNode->child, 0);
+}
+
+
+static void
+s_dump_nodes(SCSSNodePtr_t nowNode, int level)
+{
+  SCSSNodePtr_t curNode;
+  int ii;
+
+  for (curNode = nowNode->next; curNode != nowNode; curNode = curNode->next) {
+    for (ii=0; ii<level; ii++) {
+      printf("  ");
+    }
+    if (IS_STYLESHEET(curNode)) {
+      printf("stylesheet:");
+    }
+    else if (IS_ATKEYWORD(curNode)) {
+      printf("atkeyword:");
+    }
+    else if (IS_SELECTOR(curNode)) {
+      printf("selector:");
+    }
+    else if (IS_PROPERTY(curNode)) {
+      printf("property:");
+    }
+    printf("name:[%s] value1:[%s] value2:[%s]\n", curNode->name, curNode->value1, curNode->value2);
+    if (curNode->child != NULL) {
+      s_dump_nodes(curNode->child, level + 1);
+    }
+  }
+}

diff --git a/src/css/src/main.c b/src/css/src/main.c
index 54ead11..8d7627c 100644 (file)
--- a/src/css/src/main.c
+++ b/src/css/src/main.c
@@ -723,33 +723,3 @@ s_cut_url_function(SCSSDocPtr_t doc, const char *s, apr_size_t *pass_len)
   ret[*pass_len] = 0;
   return ret;
 }
-
-
-void
-scss_dump_nodes(SCSSNodePtr_t nowNode, int level)
-{
-  SCSSNodePtr_t curNode;
-  int ii;
-
-  for (curNode = nowNode->next; curNode != nowNode; curNode = curNode->next) {
-    for (ii=0; ii<level; ii++) {
-      printf("  ");
-    }
-    if (IS_STYLESHEET(curNode)) {
-      printf("stylesheet:");
-    }
-    else if (IS_ATKEYWORD(curNode)) {
-      printf("atkeyword:");
-    }
-    else if (IS_SELECTOR(curNode)) {
-      printf("selector:");
-    }
-    else if (IS_PROPERTY(curNode)) {
-      printf("property:");
-    }
-    printf("name:[%s] value1:[%s] value2:[%s]\n", curNode->name, curNode->value1, curNode->value2);
-    if (curNode->child != NULL) {
-      scss_dump_nodes(curNode->child, level + 1);
-    } 
-  }
-}

diff --git a/src/css/test/example-1.c b/src/css/test/example-1.c
index 9352a0e..56b14f3 100644 (file)
--- a/src/css/test/example-1.c
+++ b/src/css/test/example-1.c
@@ -13,7 +13,8 @@ main(int argc, char *argv[])
   apr_initialize();
   doc = scss_parser(NULL,  s);
 
-  scss_dump_nodes(doc->rootNode->child, 0);
+  scss_dump_nodes(doc);
+
   apr_terminate();
   return 0;
 }