From eefb65bcb4404e9cc7bfb96313631d49d54f3dd8 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Wed, 12 Jan 2022 20:59:28 +0800 Subject: [PATCH] - fix: parser can't correctly handle variable definitions that don't have spaces like 'int*x'; - fix: parser can't correctly handle function parameters like 'int *x' --- NEWS.md | 2 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 110421 -> 110777 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 938 ++++++++++++++-------------- RedPandaIDE/editor.cpp | 1 + RedPandaIDE/parser/cppparser.cpp | 46 +- RedPandaIDE/parser/cpptokenizer.cpp | 10 +- RedPandaIDE/parser/cpptokenizer.h | 1 + 7 files changed, 525 insertions(+), 473 deletions(-) diff --git a/NEWS.md b/NEWS.md index c5b976ab..c0b5ff65 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,8 @@ Red Panda C++ Version 0.13.2 - fix: crash when refactor symbol and cursor is at the end of the identifier - fix: refactor symbol doesn't work for 1-length identifiers - enhancement: redirect stdio to a file while debugging ( must use gdb server mode to debug) + - fix: parser can't correctly handle variable definitions that don't have spaces like 'int*x'; + - fix: parser can't correctly handle function parameters like 'int *x' Red Panda C++ Version 0.13.1 - enhancement: suppoort localization info in project templates diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 2c654303f435610e2deeb984f8c83d622bf0f98e..1961990820c1eb7881ed69bdc16eb584d01cd4df 100644 GIT binary patch delta 10340 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 diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 76d97719..a4eb5f43 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -165,17 +165,17 @@ p, li { white-space: pre-wrap; } BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -221,37 +221,37 @@ p, li { white-space: pre-wrap; } BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -947,18 +947,18 @@ Are you really want to continue? CppRefacter - - + + Rename Symbol Error 重命名符号失败 - + Can't rename symbols not defined in this file. 无法重命名不在本文件中定义的符号 - + New symbol already exists! 新符号名称已被使用！ @@ -1097,68 +1097,68 @@ Are you really want to continue? Debugger - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - + Debugger path error 调试路径错误 - + Debugger's path "%1" contains non-ascii characters. 调试路径"%1"中包含非ASCII字符（如，中文字符） - - + + This prevents it from executing. 这会导致调试器无法启动。 - + Debugger not exists 找不到调试器 - + Can''t find debugger in : "%1" 找不到调试器程序"%1" - + GDB Server path error gdb server路径错误 - + GDB Server's path "%1" contains non-ascii characters. gdb server的路径"%1"包含中文或者全角字符 - + GDB Server not exists 找不到gdb server - + Can''t find gdb server in : "%1" 无法在"%1"找到gdb server - + Execute to evaluate 执行以求值 @@ -1167,22 +1167,22 @@ Are you really want to continue? 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -1247,40 +1247,40 @@ Are you really want to continue? 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 - - + + Symbol '%1' not found! 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -2188,20 +2188,34 @@ Are you really want to continue? 运行程序的命令行参数 - + Redirect input to the following file: 将程序的标准输入重定向到下面的文件 - + + Debugger doesn't support this feature in Linux. + Linux下调试器不支持此功能。 + + + Note: + 说明： + + + + Debugger only support this feature in gdb server mode in windows. + Windows下调试器需启用gdb server模式支持此功能。 + + + + Browse 浏览 - Note: Debugger doesn't support this feature. - 注意:由于gdb的bug，调试时不支持该功能 + 注意:由于gdb的bug，调试时不支持该功能 @@ -3179,70 +3193,70 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - + - + - + + Issues 编译器 - + Compile Log 编译日志 - + File 文件 - + Tools 工具 + - Run 运行 - + Edit 编辑 - - + + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -3252,10 +3266,10 @@ Are you really want to continue? - + + - - + Debug 调试 @@ -3266,7 +3280,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3286,50 +3300,50 @@ Are you really want to continue? 局部变量 - - - + + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -3342,262 +3356,262 @@ Are you really want to continue? 工具栏2 - + New 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - + + - - - + + Compile 编译 - + F9 F9 - + F10 F10 - + Undo 恢复 - + Ctrl+Z Ctrl+Z - + Redo 重做 - + Ctrl+Y Ctrl+Y - + Cut 剪切 - + Ctrl+X Ctrl+X - - - + + + Copy 复制 - + Ctrl+C Ctrl+C - - + + Paste 粘贴 - + Ctrl+V Ctrl+V - - + + Select All 选择全部 - + Ctrl+A Ctrl+A - + Indent 缩进 - + UnIndent 取消缩进 - + Toggle Comment 切换注释 - + Ctrl+/ Ctrl+/ - + Collapse All 全部收起 - + Uncollapse All 全部展开 - + Encode in ANSI 使用ANSI编码 - + Encode in UTF-8 使用UTF-8编码 - + Auto Detect 自动检测 - + Convert to ANSI 转换为ANSI编码 - + Convert to UTF-8 转换为UTF-8编码 + - Compile & Run 编译运行 - + F11 F11 + - Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - - + + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -3616,14 +3630,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3639,500 +3653,500 @@ Are you really want to continue? 地址表达式： - + Cancel 取消 - - + + TODO TODO - - + + Bookmark 书签 - - - - + + + + Problem 试题 + - Add Probem Case 添加试题案例 + - Remove Problem Case Remove Problem Set 删除试题集 + - Open Anwser Source File 打开答案源代码文件 + - Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 - + %v/%m %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 - + Help 帮助 - + Refactor 重构 - + View 视图 - + Tool Windows 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 + - New Source File 新建源代码文件 - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Goto Definition 跳转到定义处 - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - + New File 新建项目文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M + - C++ Reference C++参考手册 - + C Reference C参考手册 - + Tool Window Bars 工具窗口栏 - + Status Bar 状态栏 - + Ctrl+Backspace Ctrl+Backspace - + Interrupt 中断 @@ -4141,47 +4155,47 @@ Are you really want to continue? 插入行 - + Delete Line 删除当前行 - + Ctrl+D Ctrl+D - + Duplicate Line 复制当前行 - + Ctrl+E Ctrl+E - + Delete Word 删除当前单词 - + Ctrl+Shift+D Ctrl+Shift+D - + Delete to EOL 删除到行尾 - + Ctrl+Del Ctrl+Del - + Delete to BOL 删除到行首 @@ -4190,78 +4204,78 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 - - + + Open Folder 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - + - + + Debugging 正在调试 - - + - + + Running 正在运行 - - + - + + Compiling 正在编译 @@ -4270,193 +4284,193 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - + Load last open info error 载入上次打开信息失败 - + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -4477,68 +4491,68 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - - + + Rebuild Project 重新构建项目 - - + + Project has been modified, do you want to rebuild it? 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 - + Auto save "%1" to "%2" failed:%3 自动保存"%1"到"%2"失败：%3 - + Properties... 试题属性... - + Set Problem Set Name 设置试题集名称 - + Problem Set Name: 试题集名称： - + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -4547,240 +4561,240 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - + Do you really want to do that? 你真的想要做那些吗？ - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as @@ -4789,222 +4803,222 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ - + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + + Confirm Convertion 确认转换 - - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6548,12 +6562,12 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value 值 @@ -6967,7 +6981,7 @@ Are you really want to continue? 自动链接 - + @@ -7043,15 +7057,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -7469,49 +7483,49 @@ Are you really want to continue? WatchModel - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - - + + Execute to evaluate 执行以求值 - - + + Not Valid 在当前作用域中无效 - + Can't open file '%1' for read. 无法读取文件'%1'. - + Expression 表达式 - + Type 类型 - + Value 值 diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 80c54e7e..3f48c23c 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -2609,6 +2609,7 @@ void Editor::showCompletion(const QString& preWord,bool autoComplete) } else if ( (tokenType != SynHighlighterTokenType::Symbol) && (tokenType != SynHighlighterTokenType::Space) && + (tokenType != SynHighlighterTokenType::Keyword) && (tokenType != SynHighlighterTokenType::Identifier) ) { return; diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp index 4dd91712..75e42e6c 100644 --- a/RedPandaIDE/parser/cppparser.cpp +++ b/RedPandaIDE/parser/cppparser.cpp @@ -4329,20 +4329,40 @@ void CppParser::scanMethodArgs(const PStatement& functionStatement, const QStrin // SpacePos := LastPos(' ', Copy(S, BracePos, MaxInt)) // start search at brace // end else begin // } - int spacePos = s.lastIndexOf(' '); // Cut up at last space - if (spacePos >= 0) { - args = ""; - int bracketPos = s.indexOf('['); - if (bracketPos >= 0) { - args = s.mid(bracketPos); - s.truncate(bracketPos); + //skip [] + int varEndPos = s.length()-1; + int bracketLevel = 0; + while (varEndPos>=0) { + switch(s[varEndPos].unicode()) { + case ']': + bracketLevel++; + break; + case '[': + bracketLevel--; + varEndPos--; + break; } + if (bracketLevel==0) + break; + varEndPos--; + } + int varStartPos = varEndPos; + if (varEndPos>=0) { + while (varStartPos-1>=0) { + if (!mTokenizer.isIdentChar(s[varStartPos-1])) + break; + varStartPos--; + } + } + if (varStartPos>=0) { + if (varEndPos+1definitionLine, @@ -4352,6 +4372,14 @@ void CppParser::scanMethodArgs(const PStatement& functionStatement, const QStrin true, false); } + if (varStartPos= 0) { + args = s.mid(bracketPos); + s.truncate(bracketPos); + } + } paramStart = i + 1; // step over , } i++; diff --git a/RedPandaIDE/parser/cpptokenizer.cpp b/RedPandaIDE/parser/cpptokenizer.cpp index 933fbad7..61084112 100644 --- a/RedPandaIDE/parser/cpptokenizer.cpp +++ b/RedPandaIDE/parser/cpptokenizer.cpp @@ -268,8 +268,9 @@ QString CppTokenizer::getWord(bool bSkipParenthesis, bool bSkipArray, bool bSkip // Get next word... QChar* offset = mCurrent; + mCurrent++; // Copy the word ahead of us - while (isLetterChar(*mCurrent) || isDigitChar(*mCurrent)) + while (isIdentChar(*mCurrent) || isDigitChar(*mCurrent)) mCurrent++; QString currentWord; @@ -582,6 +583,11 @@ void CppTokenizer::skipToNextToken() advance(); } +bool CppTokenizer::isIdentChar(const QChar &ch) +{ + return ch.isLetter(); +} + void CppTokenizer::advance() { switch(mCurrent->unicode()) { @@ -634,7 +640,7 @@ bool CppTokenizer::isLetterChar(const QChar &ch) { // return (ch>= 'A' && ch<='Z') // || (ch>='a' && ch<='z') - return ch.isLetter() + return isIdentChar(ch) || ch == '_' || ch == '*' || ch == '&' diff --git a/RedPandaIDE/parser/cpptokenizer.h b/RedPandaIDE/parser/cpptokenizer.h index db42901e..7ac73b64 100644 --- a/RedPandaIDE/parser/cpptokenizer.h +++ b/RedPandaIDE/parser/cpptokenizer.h @@ -37,6 +37,7 @@ public: const TokenList& tokens(); PToken operator[](int i); int tokenCount(); + bool isIdentChar(const QChar& ch); private: void addToken(const QString& sText, int iLine); void advance();