Andreas Tille pushed to branch master at Debian Med / cmaple
Commits:
ccd2a189 by Andreas Tille at 2026-09-11T16:09:55+02:00
Use default ncl commands; FIXME: if the shipped ncl lib is heavily patched we
should probably stick to this.
- - - - -
1 changed file:
- debian/patches/ncl.patch
Changes:
=====================================
debian/patches/ncl.patch
=====================================
@@ -35,3 +35,28 @@ Last-Update: 2026-09-11
#include "../libraries/nclextra/modelsblock.h"
#include "../libraries/nclextra/myreader.h"
#include "modelbase.h"
+--- a/libraries/nclextra/modelsblock.cpp
++++ b/libraries/nclextra/modelsblock.cpp
+@@ -41,13 +41,16 @@ void ModelsBlock::Read(NxsToken &token)
+ if (!token.Equals("="))
+ throw NxsException("Expecting '=' after model
name", token);
+
++ // Read description until semicolon (replaces
GetNextContiguousToken)
+ token.SetLabileFlagBit(NxsToken::preserveUnderscores);
+- token.GetNextContiguousToken(';');
+- model.description = token.GetToken();
+-
+- token.GetNextToken();
+- if (!token.Equals(";"))
+- throw NxsException("Expecting ';' to terminate
MODEL command", token);
++ std::string desc;
++ while (true) {
++ token.GetNextToken();
++ if (token.Equals(";")) break;
++ if (!desc.empty()) desc += " ";
++ desc += token.GetToken();
++ }
++ model.description = desc;
+
+ model.flag |=
(NM_ATOMIC*(model.description.find_first_of("+*") == string::npos &&
model.description.find("MIX") == string::npos));
+
View it on GitLab:
https://salsa.debian.org/med-team/cmaple/-/commit/ccd2a189edcbbcc0ed580ca1c11827b1054c7c3e
--
View it on GitLab:
https://salsa.debian.org/med-team/cmaple/-/commit/ccd2a189edcbbcc0ed580ca1c11827b1054c7c3e
You're receiving this email because of your account on salsa.debian.org. Manage
all notifications: https://salsa.debian.org/-/profile/notifications | Help:
https://salsa.debian.org/help
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
