Revision: 75404
http://sourceforge.net/p/brlcad/code/75404
Author: starseeker
Date: 2020-04-15 01:04:18 +0000 (Wed, 15 Apr 2020)
Log Message:
-----------
remove unused columnparse.c file
Modified Paths:
--------------
brlcad/trunk/src/librt/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/src/librt/columnparse.c
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2020-04-15 00:54:12 UTC (rev
75403)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2020-04-15 01:04:18 UTC (rev
75404)
@@ -242,7 +242,6 @@
set(librt_ignored_files
cache.h
- columnparse.c
librt_private.h
prcomb.c
primitives/bot/bot_edge.h
Deleted: brlcad/trunk/src/librt/columnparse.c
===================================================================
--- brlcad/trunk/src/librt/columnparse.c 2020-04-15 00:54:12 UTC (rev
75403)
+++ brlcad/trunk/src/librt/columnparse.c 2020-04-15 01:04:18 UTC (rev
75404)
@@ -1,166 +0,0 @@
-/* C O L U M N P A R S E . C
- * BRL-CAD
- *
- * Copyright (c) 2008-2020 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @addtogroup librt */
-/** @{ */
-/** @file librt/columnparse.c
- */
-
-#include "common.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <regex.h>
-#include "bio.h"
-
-#include "bn.h"
-#include "rt/db4.h"
-#include "raytrace.h"
-
-
-struct col_properties {
- int col_cnt;
- int *col_sizes;
- char **col_attrnames;
-};
-
-
-static void
-parse_line(struct bu_vls *line, struct col_properties *cp)
-{
- int currentposstart = 0;
- int currentposend = 0;
- int currentcol = -1;
- struct bu_vls workingstring = BU_VLS_INIT_ZERO;
-
- while (currentcol < cp->col_cnt) {
- currentcol++;
- currentposstart = currentposend;
- currentposend += cp->col_sizes[currentcol];
- bu_vls_trunc(&workingstring, 0);
- bu_vls_strncpy(&workingstring, bu_vls_addr(line)+currentposstart,
currentposend - currentposstart);
- bu_vls_trimspace(&workingstring);
- bu_log("column %d contents: %s\n", currentcol,
bu_vls_addr(&workingstring));
- }
-}
-
-
-static void
-find_columns(char *name, struct col_properties *cp)
-{
- regex_t compiled_regex;
- regmatch_t *result_locations;
- int ret, components;
- struct bu_vls modelregex = BU_VLS_INIT_ZERO;
- struct bu_vls attrregex = BU_VLS_INIT_ZERO;
- struct bu_vls workingstring1 = BU_VLS_INIT_ZERO;
- struct bu_vls workingstring2 = BU_VLS_INIT_ZERO;
- struct bu_vls testresult = BU_VLS_INIT_ZERO;
-
- bu_vls_sprintf(&modelregex, "([ ]*Model Name[ ]*)(.*)");
- bu_vls_sprintf(&attrregex, "([a-zA-Z0-9]*[ ]*)([a-zA-Z0-9].*$)?");
- bu_vls_sprintf(&workingstring1, "%s", name);
-
- ret=regcomp(&compiled_regex, bu_vls_addr(&modelregex), REG_EXTENDED);
- components = 2;
- result_locations = (regmatch_t *)bu_calloc(components + 1,
sizeof(regmatch_t), "array to hold answers from regex");
-
- ret=regexec(&compiled_regex, bu_vls_addr(&workingstring1), components+1,
result_locations, 0);
-
- bu_vls_trunc(&testresult, 0);
- bu_vls_strncpy(&testresult,
bu_vls_addr(&workingstring1)+result_locations[1].rm_so,
result_locations[1].rm_eo - result_locations[1].rm_so);
- cp->col_sizes[0] = bu_vls_strlen(&testresult);
- bu_log("stringlength:%d\n", cp->col_sizes[0]);
- bu_vls_trimspace(&testresult);
- cp->col_attrnames[0] = bu_vls_addr(&testresult);
- bu_log("trimmed name:%s\n", cp->col_attrnames[0]);
-
- bu_vls_trunc(&workingstring2, 0);
- bu_vls_strncpy(&workingstring2,
bu_vls_addr(&workingstring1)+result_locations[2].rm_so,
result_locations[2].rm_eo - result_locations[2].rm_so);
-
- while ((0 < bu_vls_strlen(&workingstring2)) && (ret != REG_NOMATCH)) {
- bu_vls_sprintf(&workingstring1, "%s", bu_vls_addr(&workingstring2));
- ret=regcomp(&compiled_regex, bu_vls_addr(&attrregex), REG_EXTENDED);
- ret=regexec(&compiled_regex, bu_vls_addr(&workingstring1),
components+1, result_locations, 0);
- bu_vls_trunc(&testresult, 0);
- bu_vls_strncpy(&testresult,
bu_vls_addr(&workingstring1)+result_locations[1].rm_so,
result_locations[1].rm_eo - result_locations[1].rm_so);
- bu_log("\n%s\n", bu_vls_addr(&testresult));
-
- bu_vls_trunc(&workingstring2, 0);
- bu_vls_strncpy(&workingstring2,
bu_vls_addr(&workingstring1)+result_locations[2].rm_so,
result_locations[2].rm_eo - result_locations[2].rm_so);
-
- cp->col_cnt = cp->col_cnt + 1;
- cp->col_sizes[cp->col_cnt] = bu_vls_strlen(&testresult);
- bu_vls_trimspace(&testresult);
- cp->col_attrnames[cp->col_cnt] = bu_vls_addr(&testresult);
- bu_log("stringlength:%d\n", cp->col_sizes[cp->col_cnt]);
- bu_log("trimmed name:%s\n", cp->col_attrnames[cp->col_cnt]);
- }
-
- bu_log("columns found: %d\n", cp->col_cnt);
-
- bu_log("\n");
-
- bu_free(result_locations, "free regex results");
-}
-
-
-int
-main()
-{
- FILE *fp;
- struct col_properties cp;
- struct bu_vls currentline = BU_VLS_INIT_ZERO;
-
-
- cp.col_cnt = 0;
- cp.col_sizes = (int *)bu_malloc(sizeof(int) * 10, "initial array of column
sizes");
- cp.col_attrnames = (char **)bu_malloc(sizeof(char *) * 11, "initial array
of attribute names");
-
- fp = fopen("./test.txt", "r");
- bu_vls_gets(¤tline, fp);
- find_columns(bu_vls_addr(¤tline), &cp);
-
- /* header separator is a throwaway */
- bu_vls_gets(¤tline, fp);
- bu_vls_trunc(¤tline, 0);
-
- while (!(bu_vls_gets(¤tline, fp) < 0)) {
- /*printf("line: %s\n\n", bu_vls_addr(¤tline));*/
- parse_line(¤tline, &cp);
- bu_vls_trunc(¤tline, 0);
- }
-
- fclose(fp);
- return 1;
-}
-
-
-/** @} */
-/*
- * Local Variables:
- * tab-width: 8
- * mode: C
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
