biodiversity 5.9.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d8e703cc56923264e8e22f952cbd830ece8ea6e37424361a75e162bd365ea53
-  data.tar.gz: 9abfa4a51256a13ef70fa66f22f4409aac2bd5b94701dff1518f8d273848d431
+  metadata.gz: 323ba157e2da0f89adff6455f76a193dfaf745e3ad2d93f8758aec1624fe97ee
+  data.tar.gz: aa54199f592c05913431b128e6396bafc7133ee23fad0c62e025e8fac8ae78de
 SHA512:
-  metadata.gz: 7f78cad633fa010aa9c7973108b1e78c9e54d28160f2161906a8963e52c28d2baa5e62c47e675ffafe316dca6166f4d3c85c50432c92d57607bdb6d7c3d42ac2
-  data.tar.gz: 20a063b9504f384da8c876fe8f9b64814b89b843622027ee81b8cfee79fe616ee78e130444808b264b766a2fb0d42b1dfa577d17e202f93fcac1bf59a22712e7
+  metadata.gz: 30fc1c8f31ba3ade55a09d31657939503bd7dc3bcd024fa5e9abf6dffbf11cf989bf13ab661ab41407e18c59bf912c9e259f173a1e4295183c49a50870d49214
+  data.tar.gz: 93c0282ccabbcc634ff226c78c01ca6f3285bcf03427fbef89db045fa7553c98b142f4d9278e6b5c14e1e7853c96f5c1b56b68b04896f59444d7b6a320ff5a2f

data/.github/workflows/ruby.yml

@@ -0,0 +1,44 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master, pipe_approach ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        ruby: [2.6, 2.7, 3.0, 3.1, 3.2, 3.3]
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install --jobs 4 --retry 3
+    - name: Show environment
+      run: gem environment
+    - name: Run tests
+      run: bundle exec rake
+    - name: Checking install works
+      run: rake install
+    - name: Check gem with IRB
+      run: cd && pwd && echo "require 'biodiversity'; Biodiversity::Parser.parse('Testidae')" | irb

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.5

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2008-2020 Dmitry Mozzherin
+Copyright (c) 2008-2024 Dmitry Mozzherin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -95,9 +95,9 @@ Biodiversity::Parser.parse("      Plantago       major    ")[:normalized]
 # to get canonical form with or without infraspecies ranks, as well as
 # stemmed version.
 parsed = Biodiversity::Parser.parse("Seddera latifolia H. & S. var. latifolia")
-parsed[:canonicalName][:full]
-parsed[:canonicalName][:simple]
-parsed[:canonicalName][:stem]
+parsed[:canonical][:full]
+parsed[:canonical][:simple]
+parsed[:canonical][:stem]
 
 # to get detailed information about elements of the name
 Biodiversity::Parser.parse("Pseudocercospora dendrobii (H.C. Burnett 1883) U. \
@@ -126,11 +126,11 @@ For example "Homo sapiens" should generate
 
 ## Copyright
 
-Authors: [Dmitry Mozzherin][dimus]
+Authors: [Dmitry Mozzherin][dimus], [Hernán Lucas Pereira][hernan]
 
-Contributors: [Patrick Leary][pleary], [Hernán Lucas Pereira][hernan]
+Contributors: [Patrick Leary][pleary]
 
-Copyright (c) 2008-2021 Dmitry Mozzherin. See [LICENSE][license]
+Copyright (c) 2008-2024 Dmitry Mozzherin. See [LICENSE][license]
 for further details.
 
 [gem_svg]: https://badge.fury.io/rb/biodiversity.svg

data/biodiversity.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'ffi', '~> 1.15'
 
-  gem.add_development_dependency 'bundler', '~> 2.4'
   gem.add_development_dependency 'byebug', '~> 11.1'
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rspec', '~> 3.12'
   gem.add_development_dependency 'rubocop', '~> 1.50'
+  gem.add_development_dependency 'rubocop-rubycw', '~> 0.1.6'
   gem.add_development_dependency 'solargraph', '~> 0.49'
 end

data/lib/biodiversity/parser/gnparser.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'csv'
+
+module Biodiversity
+  # Parser provides a namespace for functions to parse scientific names.
+  module Parser
+    # gnparser abstract class interface
+    class GnParser
+      def parse(name)
+        sync do
+          push(name)
+          pull
+        end
+      end
+
+      def parse_ary(ary)
+        sync do
+          count = ary.count
+          Thread.new do
+            ary.each { |n| push(n) }
+          end
+
+          res = []
+          count.times { res << pull }
+          res
+        end
+      end
+
+      private
+
+      def initialize(extra_settings = '')
+        @semaphore = Mutex.new
+        @pid = nil
+        @extra_settings = extra_settings
+      end
+
+      def start_gnparser
+        platform_suffix =
+          case Gem.platforms[1].os
+          when 'linux'
+            'linux'
+          when 'darwin'
+            'mac'
+          when /^mingw\d{2}?$/
+            'win.exe'
+          else
+            raise "Unsupported platform: #{Gem.platforms[1].os}"
+          end
+        path = File.join(__dir__, '..', '..', '..',
+                         'ext', "gnparser-#{platform_suffix}")
+
+        @stdin, @stdout = Open3.popen2(
+          "#{path} --format #{format} --details --quiet --stream --jobs 1 #{@extra_settings}"
+        )
+
+        init_gnparser
+
+        @pid = Process.pid
+      end
+
+      def sync
+        @semaphore.synchronize do
+          start_gnparser unless Process.pid == @pid
+          yield
+        end
+      end
+
+      def retry_pipe(retries = 1)
+        yield
+      rescue Errno::EPIPE
+        if retries.zero?
+          @pid = nil
+          raise
+        else
+          start_gnparser
+          retries -= 1
+          retry
+        end
+      end
+
+      def push(name)
+        name = clean_name(name)
+        retry_pipe { @stdin.puts(name) }
+      end
+
+      def pull
+        output = retry_pipe { @stdout.gets }
+        parse_output(output)
+      end
+
+      def clean_name(name)
+        name.gsub(/(\n|\r\n|\r)/, ' ')
+      end
+
+      def init_gnparser; end
+
+      # gnparser interface to CSV-formatted output
+      class Csv < self
+        def parse_output(output)
+          parsed = CSV.new(output).first
+          {
+            id: get_csv_value(parsed, 'Id'),
+            verbatim: get_csv_value(parsed, 'Verbatim'),
+            cardinality: get_csv_value(parsed, 'Cardinality'),
+            canonical: {
+              stemmed: get_csv_value(parsed, 'CanonicalStem'),
+              simple: get_csv_value(parsed, 'CanonicalSimple'),
+              full: get_csv_value(parsed, 'CanonicalFull')
+            },
+            authorship: get_csv_value(parsed, 'Authorship'),
+            year: get_csv_value(parsed, 'Year'),
+            quality: get_csv_value(parsed, 'Quality')&.to_i
+          }
+        end
+
+        def format
+          'csv'
+        end
+
+        def init_gnparser
+          @csv_mapping = {}
+          CSV.new(@stdout.gets).read[0].each.with_index do |header, index|
+            @csv_mapping[header] = index
+          end
+        end
+
+        def get_csv_value(csv, field_name)
+          csv[@csv_mapping[field_name]]
+        end
+      end
+
+      # gnparser interface to JSON-formatted output
+      class Compact < self
+        def parse_output(output)
+          JSON.parse(output, symbolize_names: true).tap { |o| o&.dig(:parserVersion)&.sub!(/^/, 'GNparser ') }
+        end
+
+        def format
+          'compact'
+        end
+      end
+    end
+
+    private_constant :GnParser
+  end
+end

data/lib/biodiversity/parser.rb

@@ -1,100 +1,25 @@
 # frozen_string_literal: true
 
-# CLib is required to free memory after it is used by C
-module CLib
-  extend FFI::Library
-  ffi_lib FFI::Library::LIBC
-  attach_function :free, [:pointer], :void
-end
+require_relative 'parser/gnparser'
 
 module Biodiversity
   # Parser provides a namespace for functions to parse scientific names.
   module Parser
-    extend FFI::Library
-
-    platform = case Gem.platforms[1].os
-               when 'linux'
-                 'linux'
-               when 'darwin'
-                 'mac'
-               when 'mingw32'
-                 'win'
-               else
-                 raise "Unsupported platform: #{Gem.platforms[1].os}"
-               end
-    ffi_lib File.join(__dir__, '..', '..', 'clib', platform, 'libgnparser.so')
-    POINTER_SIZE = FFI.type_size(:pointer)
-
-    callback(:parser_callback, %i[string], :void)
-
-    attach_function(:parse_go, :ParseToString,
-                    %i[string string int int], :strptr)
-    attach_function(:parse_ary_go, :ParseAryToString,
-                    %i[pointer int string int int], :strptr)
-    attach_function(:free_mem, :FreeMemory, %i[pointer], :void)
+    @compact_gnparser = {
+      false => GnParser::Compact.new,
+      true => GnParser::Compact.new('--cultivar')
+    }
+    @csv_gnparser = {
+      false => GnParser::Csv.new,
+      true => GnParser::Csv.new('--cultivar')
+    }
 
     def self.parse(name, simple: false, with_cultivars: false)
-      format = simple ? 'csv' : 'compact'
-      with_details = simple ? 0 : 1
-      with_cultivars = with_cultivars ? 1 : 0
-
-      parsed, ptr = parse_go(name, format, with_details, with_cultivars)
-      free_mem(ptr)
-      output(parsed, simple)
+      (simple ? @csv_gnparser[!!with_cultivars] : @compact_gnparser[!!with_cultivars]).parse(name)
     end
 
     def self.parse_ary(ary, simple: false, with_cultivars: false)
-      format = simple ? 'csv' : 'compact'
-      with_details = simple ? 0 : 1
-      with_cultivars = with_cultivars ? 1 : 0
-
-      in_ptr = FFI::MemoryPointer.new(:pointer, ary.length)
-      in_ptr.write_array_of_pointer(
-        ary.map { |s| FFI::MemoryPointer.from_string(s) }
-      )
-
-      parsed, ptr = parse_ary_go(in_ptr, ary.length, format,
-                                 with_details, with_cultivars)
-      free_mem(ptr)
-      if simple
-        CSV.new(parsed.force_encoding('UTF-8')).map do |row|
-          csv_row(row)
-        end
-      else
-        JSON.parse(parsed, symbolize_names: true).map do |item|
-          item[:parserVersion] = Biodiversity.gnparser_version
-          item
-        end
-      end
-    end
-
-    def self.output(parsed, simple)
-      if simple
-        parsed = parsed.force_encoding('UTF-8')
-        csv = CSV.new(parsed)
-        row = csv.readlines[0]
-        csv_row(row)
-      else
-        parsed = JSON.parse(parsed, symbolize_names: true)
-        parsed[:parserVersion] = Biodiversity.gnparser_version
-        parsed
-      end
-    end
-
-    def self.csv_row(row)
-      {
-        id: row[0],
-        verbatim: row[1],
-        cardinality: row[2].to_i,
-        canonical: {
-          stem: row[3],
-          simple: row[4],
-          full: row[5]
-        },
-        authorship: row[6],
-        year: row[7],
-        quality: row[8].to_i
-      }
+      (simple ? @csv_gnparser[!!with_cultivars] : @compact_gnparser[!!with_cultivars]).parse_ary(ary)
     end
   end
 end

data/lib/biodiversity/version.rb

@@ -2,8 +2,8 @@
 
 # Biodiversity module provides a namespace for scientific name parser.
 module Biodiversity
-  VERSION = '5.9.1'
-  GNPARSER_VERSION = 'GNparser 1.9.1'
+  VERSION = '6.0.0'
+  GNPARSER_VERSION = 'GNparser 1.10.1'
 
   def self.version
     VERSION

data/lib/biodiversity.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffi'
 require 'json'
 require 'csv'
 require_relative 'biodiversity/version'

data/spec/lib/biodiversity_spec.rb

@@ -6,4 +6,10 @@ describe Biodiversity do
       expect(subject.version).to match(/\d+\.\d+\.\d+/)
     end
   end
+  describe 'gnparser_version' do
+    it 'matches bundled binary version' do
+      binary_version = Biodiversity::Parser.parse('')[:parserVersion].match(/\d.*$/).to_s
+      expect(subject.gnparser_version).to match("GNparser #{binary_version}")
+    end
+  end
 end

data/spec/lib/parser_spec.rb

@@ -27,6 +27,12 @@ describe Biodiversity::Parser do
       expect(parsed[:normalized]).to be_nil
     end
 
+    it 'treats newlines as whitespaces' do # Requirement for IPC to work
+      parsed = subject.parse("\nHomo\r\nsapiens\nLinn.\r1758\n")
+      expect(parsed[:verbatim]).to eq ' Homo sapiens Linn. 1758 '
+      expect(parsed[:normalized]).to eq parsed[:verbatim].strip
+    end
+
     it 'parses botanical cultivars in full form' do
       parsed = subject.parse('Aus bus "White Russian"',
                              simple: false, with_cultivars: true)
@@ -79,5 +85,13 @@ describe Biodiversity::Parser do
       expect(parsed[2][:quality]).to eq 1
       expect(parsed[2][:parserVersion]).to match(/GNparser/)
     end
+
+    it 'treats newlines as whitespaces' do # Requirement for IPC to work
+      parsed = subject.parse_ary(["\nHomo\r\nsapiens\nLinn.\r1758\n"])
+      expect(parsed.length).to eq 1
+      parsed = parsed.first
+      expect(parsed[:verbatim]).to eq ' Homo sapiens Linn. 1758 '
+      expect(parsed[:normalized]).to eq parsed[:verbatim].strip
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biodiversity
 version: !ruby/object:Gem::Version
-  version: 5.9.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.50'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rubycw
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -125,14 +126,12 @@ files:
 - README.md
 - Rakefile
 - biodiversity.gemspec
-- clib/linux/libgnparser.h
-- clib/linux/libgnparser.so
-- clib/mac/libgnparser.h
-- clib/mac/libgnparser.so
-- clib/win/libgnparser.h
-- clib/win/libgnparser.so
+- ext/gnparser-linux
+- ext/gnparser-mac
+- ext/gnparser-win.exe
 - lib/biodiversity.rb
 - lib/biodiversity/parser.rb
+- lib/biodiversity/parser/gnparser.rb
 - lib/biodiversity/version.rb
 - spec/lib/biodiversity_spec.rb
 - spec/lib/parser_spec.rb
@@ -156,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Parser of scientific names

data/clib/linux/libgnparser.h

@@ -1,103 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package github.com/gnames/gnparser/binding */
-
-
-#line 1 "cgo-builtin-export-prolog"
-
-#include <stddef.h>
-
-#ifndef GO_CGO_EXPORT_PROLOGUE_H
-#define GO_CGO_EXPORT_PROLOGUE_H
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef struct { const char *p; ptrdiff_t n; } _GoString_;
-#endif
-
-#endif
-
-/* Start of preamble from import "C" comments.  */
-
-
-#line 5 "main.go"
-
-  #include "stdlib.h"
-
-#line 1 "cgo-generated-wrapper"
-
-
-/* End of preamble from import "C" comments.  */
-
-
-/* Start of boilerplate cgo prologue.  */
-#line 1 "cgo-gcc-export-header-prolog"
-
-#ifndef GO_CGO_PROLOGUE_H
-#define GO_CGO_PROLOGUE_H
-
-typedef signed char GoInt8;
-typedef unsigned char GoUint8;
-typedef short GoInt16;
-typedef unsigned short GoUint16;
-typedef int GoInt32;
-typedef unsigned int GoUint32;
-typedef long long GoInt64;
-typedef unsigned long long GoUint64;
-typedef GoInt64 GoInt;
-typedef GoUint64 GoUint;
-typedef size_t GoUintptr;
-typedef float GoFloat32;
-typedef double GoFloat64;
-#ifdef _MSC_VER
-#include <complex.h>
-typedef _Fcomplex GoComplex64;
-typedef _Dcomplex GoComplex128;
-#else
-typedef float _Complex GoComplex64;
-typedef double _Complex GoComplex128;
-#endif
-
-/*
-  static assertion to make sure the file is being used on architecture
-  at least with matching size of GoInt.
-*/
-typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef _GoString_ GoString;
-#endif
-typedef void *GoMap;
-typedef void *GoChan;
-typedef struct { void *t; void *v; } GoInterface;
-typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
-
-#endif
-
-/* End of boilerplate cgo prologue.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// ParseToString function takes a name-string, desired format, a withDetails
-// flag as 0|1 integer. It parses the name-string to either JSON, or a CSV
-// string, depending on the desired format. Format argument can take values of
-// 'csv', 'compact', 'pretty'. If withDetails argument is 0, additional
-// parsed details are ommited, if it is 1 -- they are included.
-// true.
-extern char* ParseToString(char* name, char* f, int details, int cultivars, int diaereses);
-
-// FreeMemory takes a string pointer and frees its memory.
-extern void FreeMemory(char* p);
-
-// ParseAryToString function takes an array of names, parsing format, and a
-// withDetails flag as 0|1 integer.  Parsed outputs are sent as a string in
-// either CSV or JSON format.  Format argument can take values of 'csv',
-// 'compact', or 'pretty'. For withDetails argument 0 means false, 1 means
-// true.
-extern char* ParseAryToString(char** in, int length, char* f, int details, int cultivars, int diaereses);
-
-#ifdef __cplusplus
-}
-#endif

data/clib/mac/libgnparser.h

@@ -1,103 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package github.com/gnames/gnparser/binding */
-
-
-#line 1 "cgo-builtin-export-prolog"
-
-#include <stddef.h>
-
-#ifndef GO_CGO_EXPORT_PROLOGUE_H
-#define GO_CGO_EXPORT_PROLOGUE_H
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef struct { const char *p; ptrdiff_t n; } _GoString_;
-#endif
-
-#endif
-
-/* Start of preamble from import "C" comments.  */
-
-
-#line 5 "main.go"
-
-  #include "stdlib.h"
-
-#line 1 "cgo-generated-wrapper"
-
-
-/* End of preamble from import "C" comments.  */
-
-
-/* Start of boilerplate cgo prologue.  */
-#line 1 "cgo-gcc-export-header-prolog"
-
-#ifndef GO_CGO_PROLOGUE_H
-#define GO_CGO_PROLOGUE_H
-
-typedef signed char GoInt8;
-typedef unsigned char GoUint8;
-typedef short GoInt16;
-typedef unsigned short GoUint16;
-typedef int GoInt32;
-typedef unsigned int GoUint32;
-typedef long long GoInt64;
-typedef unsigned long long GoUint64;
-typedef GoInt64 GoInt;
-typedef GoUint64 GoUint;
-typedef size_t GoUintptr;
-typedef float GoFloat32;
-typedef double GoFloat64;
-#ifdef _MSC_VER
-#include <complex.h>
-typedef _Fcomplex GoComplex64;
-typedef _Dcomplex GoComplex128;
-#else
-typedef float _Complex GoComplex64;
-typedef double _Complex GoComplex128;
-#endif
-
-/*
-  static assertion to make sure the file is being used on architecture
-  at least with matching size of GoInt.
-*/
-typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef _GoString_ GoString;
-#endif
-typedef void *GoMap;
-typedef void *GoChan;
-typedef struct { void *t; void *v; } GoInterface;
-typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
-
-#endif
-
-/* End of boilerplate cgo prologue.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// ParseToString function takes a name-string, desired format, a withDetails
-// flag as 0|1 integer. It parses the name-string to either JSON, or a CSV
-// string, depending on the desired format. Format argument can take values of
-// 'csv', 'compact', 'pretty'. If withDetails argument is 0, additional
-// parsed details are ommited, if it is 1 -- they are included.
-// true.
-extern char* ParseToString(char* name, char* f, int details, int cultivars, int diaereses);
-
-// FreeMemory takes a string pointer and frees its memory.
-extern void FreeMemory(char* p);
-
-// ParseAryToString function takes an array of names, parsing format, and a
-// withDetails flag as 0|1 integer.  Parsed outputs are sent as a string in
-// either CSV or JSON format.  Format argument can take values of 'csv',
-// 'compact', or 'pretty'. For withDetails argument 0 means false, 1 means
-// true.
-extern char* ParseAryToString(char** in, int length, char* f, int details, int cultivars, int diaereses);
-
-#ifdef __cplusplus
-}
-#endif

data/clib/win/libgnparser.h

@@ -1,103 +0,0 @@
-/* Code generated by cmd/cgo; DO NOT EDIT. */
-
-/* package github.com/gnames/gnparser/binding */
-
-
-#line 1 "cgo-builtin-export-prolog"
-
-#include <stddef.h>
-
-#ifndef GO_CGO_EXPORT_PROLOGUE_H
-#define GO_CGO_EXPORT_PROLOGUE_H
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef struct { const char *p; ptrdiff_t n; } _GoString_;
-#endif
-
-#endif
-
-/* Start of preamble from import "C" comments.  */
-
-
-#line 5 "main.go"
-
-  #include "stdlib.h"
-
-#line 1 "cgo-generated-wrapper"
-
-
-/* End of preamble from import "C" comments.  */
-
-
-/* Start of boilerplate cgo prologue.  */
-#line 1 "cgo-gcc-export-header-prolog"
-
-#ifndef GO_CGO_PROLOGUE_H
-#define GO_CGO_PROLOGUE_H
-
-typedef signed char GoInt8;
-typedef unsigned char GoUint8;
-typedef short GoInt16;
-typedef unsigned short GoUint16;
-typedef int GoInt32;
-typedef unsigned int GoUint32;
-typedef long long GoInt64;
-typedef unsigned long long GoUint64;
-typedef GoInt64 GoInt;
-typedef GoUint64 GoUint;
-typedef size_t GoUintptr;
-typedef float GoFloat32;
-typedef double GoFloat64;
-#ifdef _MSC_VER
-#include <complex.h>
-typedef _Fcomplex GoComplex64;
-typedef _Dcomplex GoComplex128;
-#else
-typedef float _Complex GoComplex64;
-typedef double _Complex GoComplex128;
-#endif
-
-/*
-  static assertion to make sure the file is being used on architecture
-  at least with matching size of GoInt.
-*/
-typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
-
-#ifndef GO_CGO_GOSTRING_TYPEDEF
-typedef _GoString_ GoString;
-#endif
-typedef void *GoMap;
-typedef void *GoChan;
-typedef struct { void *t; void *v; } GoInterface;
-typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
-
-#endif
-
-/* End of boilerplate cgo prologue.  */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-// ParseToString function takes a name-string, desired format, a withDetails
-// flag as 0|1 integer. It parses the name-string to either JSON, or a CSV
-// string, depending on the desired format. Format argument can take values of
-// 'csv', 'compact', 'pretty'. If withDetails argument is 0, additional
-// parsed details are ommited, if it is 1 -- they are included.
-// true.
-extern __declspec(dllexport) char* ParseToString(char* name, char* f, int details, int cultivars, int diaereses);
-
-// FreeMemory takes a string pointer and frees its memory.
-extern __declspec(dllexport) void FreeMemory(char* p);
-
-// ParseAryToString function takes an array of names, parsing format, and a
-// withDetails flag as 0|1 integer.  Parsed outputs are sent as a string in
-// either CSV or JSON format.  Format argument can take values of 'csv',
-// 'compact', or 'pretty'. For withDetails argument 0 means false, 1 means
-// true.
-extern __declspec(dllexport) char* ParseAryToString(char** in, int length, char* f, int details, int cultivars, int diaereses);
-
-#ifdef __cplusplus
-}
-#endif