issue #11492 @plantumlfile command not recognized
#11500
Conversation
- The original problem is about the fact that fact that the `@startuml` command had a filename and this was not expected / anticipated, the result was a concatenation of the name with and "inline" name (i.e. an generated dummy name) and the given name - Potential problem with handing out the same number for an "inline" file name (multithreading, now protected by means of a mutex. - With a `\plantumlfile` it is possible to have multiple diagrams in one file, only one was shown, now all are shown.
| @@ -95,34 +73,153 @@ QCString PlantumlManager::writePlantUMLSource(const QCString &outDirArg,const QC | |||
| case '\t': break; | |||
| case ' ': break; | |||
| case '@': | |||
| if (initial && literal_at(p,"start")) // @start... | |||
| if (!insideComment && literal_at(p,"start")) // @start... | |||
There was a problem hiding this comment.
I don't really understand the use-case of this inline parser stuff. Do you have an example?
There was a problem hiding this comment.
The example: example.tar.gz
| if (fileName.isEmpty()) // generate name | ||
| { | ||
| std::lock_guard<std::mutex> lock(g_PlantUmlMutex); | ||
| puName = "inline_umlgraph_"+QCString().setNum(umlindex); |
There was a problem hiding this comment.
Using numbers like this will give instable output, i.e. when using multiple threads every run the numbers can be assigned to different graphs, and thus the output will change even if the input did not. A typical solution is to use a hash of the filename + line number, representing where the graph is found in the input, and use that to create the output name.
There was a problem hiding this comment.
The original was already using the non stable numbers and this could lead to multiple use of the same number (it is unlikely that this happens, but better to be safe hence the mutex). It indeed would be better to use a hash.
|
@albert-github I've made some simplifications. Somehow the PR could not get merged automatically, so I'll close it manually. Let me know if you see any issues. |
|
At first glance I don't see any problems. |
@startumlcommand had a filename and this was not expected / anticipated, the result was a concatenation of the name with and "inline" name (i.e. an generated dummy name) and the given name\plantumlfileit is possible to have multiple diagrams in one file, only one was shown, now all are shown.