NLPPlus 2.0.1__tar.gz → 2.0.3__tar.gz

{nlpplus-2.0.1 → nlpplus-2.0.3}/NLPPlus/__init__.py

@@ -84,7 +84,18 @@ class Engine:
         initialize: bool = False,
     ):
         if working_folder is None:
-            self.tmpdir = TemporaryDirectory(prefix="NLPPlus-")
+            # ignore_cleanup_errors=True: the nlp-engine's static `cgerr`
+            # ofstream holds <analyzer>/logs/cgerr.log open for the
+            # lifetime of the process. Python's TemporaryDirectory
+            # cleanup runs during atexit, but the C++ static destructor
+            # that would close cgerr runs *after* atexit (Python returns
+            # control to the OS first). On Windows that ordering means
+            # cleanup hits a still-open file and raises PermissionError.
+            # Swallow it — the OS reclaims the tempdir at process exit
+            # regardless. Tracked engine-side as NLP-ENGINE-523.
+            self.tmpdir = TemporaryDirectory(
+                prefix="NLPPlus-", ignore_cleanup_errors=True
+            )
             self.working_folder = Path(self.tmpdir.name)
             initialize = True
         else:

{nlpplus-2.0.1 → nlpplus-2.0.3}/NLPPlus/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.1'
-__version_tuple__ = version_tuple = (2, 0, 1)
+__version__ = version = '2.0.3'
+__version_tuple__ = version_tuple = (2, 0, 3)
 
-__commit_id__ = commit_id = 'g32cadf7a4'
+__commit_id__ = commit_id = 'gd30bbfbe8'

{nlpplus-2.0.1 → nlpplus-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: NLPPlus
-Version: 2.0.1
+Version: 2.0.3
 Summary: Python extension for the NLP++ text analysis engine
 Keywords: nlp,text
 Author-Email: David De Hilster <contact@visualtext.org>
@@ -35,6 +35,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Project-URL: Homepage, https://visualtext.org/
 Project-URL: Repository, https://github.com/VisualText/py-package-nlpengine
 Project-URL: Issues, https://github.com/VisualText/py-package-nlpengine

{nlpplus-2.0.1 → nlpplus-2.0.3}/nlp-engine/cs/libconsh/st_gen.cpp

@@ -124,6 +124,9 @@ for (ii = 0; ii <= seg_curr; ii++)
                case '\n':
                   *fp << _T("'\\n'");
                   break;
+               case '\r':
+                  *fp << _T("'\\r'");
+                  break;
                case '\t':
                   *fp << _T("'\\t'");
                   break;

{nlpplus-2.0.1 → nlpplus-2.0.3}/nlp-engine/cs/libprim/dir.cpp

@@ -10,7 +10,11 @@ All rights reserved.
 *
 *******************************************************************************/
 #include "StdAfx.h"
-#ifndef LINUX
+#ifdef LINUX
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#else
 #include <direct.h>
 #endif
 #include <stdlib.h>
@@ -30,7 +34,10 @@ make_dir(_TCHAR *dir)
 {
 if (!dir || !*dir)
 	return false;
-#ifndef LINUX
+#ifdef LINUX
+if (mkdir(dir, 0755) == 0)
+	return true;
+#else
 if (_tmkdir(dir) == 0)
 	return true;
 #endif
@@ -50,7 +57,10 @@ rm_dir(_TCHAR *dir)
 {
 if (!dir || !*dir)
 	return false;
-#ifndef LINUX
+#ifdef LINUX
+if (rmdir(dir) == 0)
+	return true;
+#else
 if (_trmdir(dir) == 0)
 	return true;
 #endif

{nlpplus-2.0.1 → nlpplus-2.0.3}/nlp-engine/lite/nlp.cpp

@@ -16,6 +16,7 @@ All rights reserved.
 #ifdef _WINDOWS
 #include "StdAfx.h"
 #endif
+#include <filesystem>	// NLP-ENGINE-527: rundir creation in compile branch.
 #include <iostream>	// 09/27/19 AM.
 #include <strstream>	// 09/27/19 AM.
 #include <time.h>
@@ -1046,6 +1047,32 @@ if (compile)																	// 05/10/00 AM.
 	{
 	// Build a gen object to control code gen and compilation.
 
+	// Ensure the run/ output directory exists before generating into it.
+	// The std::ofstreams below open run/<file> directly, and the C++
+	// runtime does NOT create the parent directory: on a fresh analyzer
+	// (no run/ yet) every open silently fails, so -COMPILE emits no
+	// analyzer-pass code and the staged run library ends up with no
+	// run_analyzer entry point -> empty tree at runtime.
+	//
+	// NLP-ENGINE-527: use std::filesystem::create_directory rather than
+	// the LITE_API make_dir() / dir_exists() pair. BOTH of those are
+	// #ifndef LINUX no-ops in lite/mach.cpp -- dir_exists() returns
+	// true unconditionally on Linux/macOS, which would short-circuit
+	// the guard, and make_dir() is also a no-op. The other 7
+	// lite/nlp.cpp make_dir() call sites (outdir, logdir, etc.) rely
+	// on the no-op behaviour and the parse-en-us regression test on
+	// macOS depends on it, so we don't fix the underlying lite/mach.cpp
+	// here. Surgical create_directory unblocks -COMPILE without
+	// touching the other call sites. The std::error_code overload is
+	// noexcept; create_directory returns false (no error) if the
+	// directory already exists, so the previous dir_exists() guard is
+	// redundant and is dropped.
+	_TCHAR rundir[MAXSTR];
+	_stprintf(rundir, _T("%s%c%s"),
+				ana_->getAppdir(), DIR_CH, DEFAULT_RUNDIR);
+	std::error_code ec;
+	std::filesystem::create_directory(rundir, ec);
+
 	// Set up an output file for code generation.
 	_stprintf(buf, _T("%s%c%s%canalyzer.cpp"),
 				ana_->getAppdir(), DIR_CH, DEFAULT_RUNDIR, DIR_CH);

{nlpplus-2.0.1 → nlpplus-2.0.3}/nlp-engine/nlp/main.cpp

@@ -15,7 +15,7 @@ All rights reserved.
 #include "lite/nlp_engine.h"
 #include "version.h"
 
-#define NLP_ENGINE_VERSION "3.1.50"
+#define NLP_ENGINE_VERSION "3.1.54"
 
 bool cmdReadArgs(int, _TCHAR *argv[], _TCHAR *&, _TCHAR *&, _TCHAR *&, _TCHAR *&, bool &, bool &, bool &, bool &, bool &);
 void cmdHelpargs(_TCHAR *);

{nlpplus-2.0.1 → nlpplus-2.0.3}/pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 
 [project.urls]
@@ -44,6 +45,7 @@ build = [
       "cp310-*",
       "cp311-*",
       "cp312-*",
+      "cp313-*",
 ]
 skip = [
      "cp*-macosx_arm64",