From ea9b50e6dfe33679ac71ae539d05db27dc67f374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 12 Mar 2020 14:08:18 +0000 Subject: [PATCH] fix defname '@' to '_' git-svn-id: svn://db.shs.com.ru/pip@947 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/code_model_generator/main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp index 39038ff4..19857d25 100755 --- a/utils/code_model_generator/main.cpp +++ b/utils/code_model_generator/main.cpp @@ -1,7 +1,7 @@ /* PIP - Platform Independent Primitives Code model generator - Copyright (C) 2019 Ivan Pelipenko peri4ko@yandex.ru + Copyright (C) 2020 Ivan Pelipenko peri4ko@yandex.ru This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -324,7 +324,16 @@ void makeGetterValue(PIFile & f, const PICodeParser::Entity * e) { void writeModel(PICodeParser & parser, PICLI & cli, const PIString out, bool meta, bool enums, bool streams, bool texts, bool getters) { PIVector ventities; - PIString defname = out.replaceAll(".", "_").replaceAll("/", "_").replaceAll(":", "_").replaceAll("-", "_").removeAll(" ").toUpperCase() + "_H"; + PIString defname = out + .replaceAll(".", "_") + .replaceAll("/", "_") + .replaceAll(":", "_") + .replaceAll("-", "_") + .replaceAll("@", "_") + .replaceAll("\\", "_") + .removeAll(" ") + .toUpperCase() + + "_H"; bool inc_h, inc_cpp; inc_h = streams || texts; inc_cpp = !inc_h && getters;