Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kumir2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kumir
kumir2
Commits
de4951b5
Commit
de4951b5
authored
Jan 28, 2013
by
Victor Yacovlev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged kumir program search path from "master"
parent
81327b46
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
6 deletions
+28
-6
src/plugins/kumiranalizer/analizer.cpp
src/plugins/kumiranalizer/analizer.cpp
+5
-0
src/plugins/kumiranalizer/analizer.h
src/plugins/kumiranalizer/analizer.h
+1
-1
src/plugins/kumiranalizer/kumiranalizerplugin.cpp
src/plugins/kumiranalizer/kumiranalizerplugin.cpp
+6
-0
src/plugins/kumiranalizer/kumiranalizerplugin.h
src/plugins/kumiranalizer/kumiranalizerplugin.h
+1
-0
src/plugins/kumiranalizer/syntaxanalizer.cpp
src/plugins/kumiranalizer/syntaxanalizer.cpp
+8
-2
src/plugins/kumiranalizer/syntaxanalizer.h
src/plugins/kumiranalizer/syntaxanalizer.h
+1
-0
src/plugins/kumirbcompiler/kumirbcompilerplugin.cpp
src/plugins/kumirbcompiler/kumirbcompilerplugin.cpp
+1
-0
src/shared/interfaces/analizerinterface.h
src/shared/interfaces/analizerinterface.h
+1
-0
src/shared/interfaces/editorinterface.h
src/shared/interfaces/editorinterface.h
+4
-3
No files found.
src/plugins/kumiranalizer/analizer.cpp
View file @
de4951b5
...
@@ -40,6 +40,11 @@ QString Analizer::sourceText() const
...
@@ -40,6 +40,11 @@ QString Analizer::sourceText() const
return
d
->
sourceText
.
join
(
"
\n
"
)
+
"
\n
"
;
return
d
->
sourceText
.
join
(
"
\n
"
)
+
"
\n
"
;
}
}
void
Analizer
::
setSourceDirName
(
const
QString
&
dirName
)
{
d
->
analizer
->
setSourceDirName
(
dirName
);
}
LineProp
Analizer
::
lineProp
(
const
QString
&
text
)
const
LineProp
Analizer
::
lineProp
(
const
QString
&
text
)
const
{
{
QList
<
Lexem
*>
lexems
;
QList
<
Lexem
*>
lexems
;
...
...
src/plugins/kumiranalizer/analizer.h
View file @
de4951b5
...
@@ -33,7 +33,7 @@ public:
...
@@ -33,7 +33,7 @@ public:
public
slots
:
public
slots
:
void
setSourceDirName
(
const
QString
&
dirName
);
void
changeSourceText
(
const
QList
<
Shared
::
ChangeTextTransaction
>
&
changes
);
void
changeSourceText
(
const
QList
<
Shared
::
ChangeTextTransaction
>
&
changes
);
void
setHiddenText
(
const
QString
&
text
,
int
baseLineNo
);
void
setHiddenText
(
const
QString
&
text
,
int
baseLineNo
);
void
setHiddenBaseLine
(
int
lineNo
);
void
setHiddenBaseLine
(
int
lineNo
);
...
...
src/plugins/kumiranalizer/kumiranalizerplugin.cpp
View file @
de4951b5
...
@@ -88,6 +88,12 @@ void KumirAnalizerPlugin::setSourceText(int documentId, const QString &text)
...
@@ -88,6 +88,12 @@ void KumirAnalizerPlugin::setSourceText(int documentId, const QString &text)
m_analizers
[
documentId
]
->
changeSourceText
(
QList
<
Shared
::
ChangeTextTransaction
>
()
<<
change
);
m_analizers
[
documentId
]
->
changeSourceText
(
QList
<
Shared
::
ChangeTextTransaction
>
()
<<
change
);
}
}
void
KumirAnalizerPlugin
::
setSourceDirName
(
int
documentId
,
const
QString
&
dirPath
)
{
Q_CHECK_PTR
(
m_analizers
[
documentId
]);
m_analizers
[
documentId
]
->
setSourceDirName
(
dirPath
);
}
void
KumirAnalizerPlugin
::
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
)
void
KumirAnalizerPlugin
::
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
)
{
{
Q_CHECK_PTR
(
m_analizers
[
documentId
]);
Q_CHECK_PTR
(
m_analizers
[
documentId
]);
...
...
src/plugins/kumiranalizer/kumiranalizerplugin.h
View file @
de4951b5
...
@@ -28,6 +28,7 @@ public:
...
@@ -28,6 +28,7 @@ public:
int
newDocument
();
int
newDocument
();
void
dropDocument
(
int
documentId
);
void
dropDocument
(
int
documentId
);
void
setSourceDirName
(
int
documentId
,
const
QString
&
dirPath
);
void
setSourceText
(
int
documentId
,
const
QString
&
text
);
void
setSourceText
(
int
documentId
,
const
QString
&
text
);
void
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
);
void
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
);
void
setHiddenTextBaseLine
(
int
documentId
,
int
baseLine
);
void
setHiddenTextBaseLine
(
int
documentId
,
int
baseLine
);
...
...
src/plugins/kumiranalizer/syntaxanalizer.cpp
View file @
de4951b5
...
@@ -41,6 +41,7 @@ struct SyntaxAnalizerPrivate
...
@@ -41,6 +41,7 @@ struct SyntaxAnalizerPrivate
QList
<
Statement
>
statements
;
QList
<
Statement
>
statements
;
QSet
<
QString
>
unresolvedImports
;
QSet
<
QString
>
unresolvedImports
;
QStringList
alwaysEnabledModules
;
QStringList
alwaysEnabledModules
;
QString
sourceDirName
;
void
parseImport
(
int
str
);
void
parseImport
(
int
str
);
void
parseModuleHeader
(
int
str
);
void
parseModuleHeader
(
int
str
);
...
@@ -552,6 +553,11 @@ void SyntaxAnalizer::processAnalisys()
...
@@ -552,6 +553,11 @@ void SyntaxAnalizer::processAnalisys()
}
}
}
}
void
SyntaxAnalizer
::
setSourceDirName
(
const
QString
&
dirName
)
{
d
->
sourceDirName
=
dirName
;
}
void
SyntaxAnalizerPrivate
::
parseImport
(
int
str
)
void
SyntaxAnalizerPrivate
::
parseImport
(
int
str
)
{
{
if
(
statements
[
str
].
hasError
())
if
(
statements
[
str
].
hasError
())
...
@@ -587,8 +593,8 @@ void SyntaxAnalizerPrivate::parseImport(int str)
...
@@ -587,8 +593,8 @@ void SyntaxAnalizerPrivate::parseImport(int str)
if
(
name
.
endsWith
(
".kum"
))
{
if
(
name
.
endsWith
(
".kum"
))
{
kumName
=
name
;
kumName
=
name
;
name
=
binName
=
name
.
left
(
name
.
length
()
-
4
)
+
".kod"
;
name
=
binName
=
name
.
left
(
name
.
length
()
-
4
)
+
".kod"
;
binFile
=
QFileInfo
(
QDir
::
current
(
).
absoluteFilePath
(
binName
));
binFile
=
QFileInfo
(
QDir
(
sourceDirName
).
absoluteFilePath
(
binName
));
kumFile
=
QFileInfo
(
QDir
::
current
(
).
absoluteFilePath
(
kumName
));
kumFile
=
QFileInfo
(
QDir
(
sourceDirName
).
absoluteFilePath
(
kumName
));
QString
kumir2bc
=
QDir
(
QCoreApplication
::
applicationDirPath
()).
absoluteFilePath
(
"kumir2-bc"
);
QString
kumir2bc
=
QDir
(
QCoreApplication
::
applicationDirPath
()).
absoluteFilePath
(
"kumir2-bc"
);
#ifdef Q_OS_WIN32
#ifdef Q_OS_WIN32
kumir2bc
+=
".exe"
;
kumir2bc
+=
".exe"
;
...
...
src/plugins/kumiranalizer/syntaxanalizer.h
View file @
de4951b5
...
@@ -22,6 +22,7 @@ public:
...
@@ -22,6 +22,7 @@ public:
,
AST_Algorhitm
*
algorhitm
);
,
AST_Algorhitm
*
algorhitm
);
void
syncStatements
();
void
syncStatements
();
QStringList
unresolvedImports
()
const
;
QStringList
unresolvedImports
()
const
;
void
setSourceDirName
(
const
QString
&
dirName
);
void
buildTables
(
bool
allowOperatorsDeclaration
);
void
buildTables
(
bool
allowOperatorsDeclaration
);
void
processAnalisys
();
void
processAnalisys
();
~
SyntaxAnalizer
();
~
SyntaxAnalizer
();
...
...
src/plugins/kumirbcompiler/kumirbcompilerplugin.cpp
View file @
de4951b5
...
@@ -87,6 +87,7 @@ void KumirBytecodeCompilerPlugin::start()
...
@@ -87,6 +87,7 @@ void KumirBytecodeCompilerPlugin::start()
int
id
=
m_analizer
->
newDocument
();
int
id
=
m_analizer
->
newDocument
();
m_analizer
->
setSourceText
(
id
,
kumFile
.
visibleText
);
m_analizer
->
setSourceText
(
id
,
kumFile
.
visibleText
);
m_analizer
->
setSourceDirName
(
id
,
QFileInfo
(
filename
).
absoluteDir
().
dirName
());
if
(
kumFile
.
hasHiddenText
)
{
if
(
kumFile
.
hasHiddenText
)
{
m_analizer
->
setHiddenText
(
id
,
kumFile
.
hiddenText
,
-
1
);
m_analizer
->
setHiddenText
(
id
,
kumFile
.
hiddenText
,
-
1
);
}
}
...
...
src/shared/interfaces/analizerinterface.h
View file @
de4951b5
...
@@ -21,6 +21,7 @@ public:
...
@@ -21,6 +21,7 @@ public:
virtual
bool
caseInsensitiveGrammatic
()
const
=
0
;
virtual
bool
caseInsensitiveGrammatic
()
const
=
0
;
virtual
bool
supportPartialCompiling
()
const
=
0
;
virtual
bool
supportPartialCompiling
()
const
=
0
;
virtual
void
dropDocument
(
int
documentId
)
=
0
;
virtual
void
dropDocument
(
int
documentId
)
=
0
;
virtual
void
setSourceDirName
(
int
documentId
,
const
QString
&
dirPath
)
=
0
;
virtual
void
setSourceText
(
int
documentId
,
const
QString
&
text
)
=
0
;
virtual
void
setSourceText
(
int
documentId
,
const
QString
&
text
)
=
0
;
virtual
void
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
)
=
0
;
virtual
void
setHiddenText
(
int
documentId
,
const
QString
&
text
,
int
baseLine
)
=
0
;
virtual
void
setHiddenTextBaseLine
(
int
documentId
,
int
baseLine
)
=
0
;
virtual
void
setHiddenTextBaseLine
(
int
documentId
,
int
baseLine
)
=
0
;
...
...
src/shared/interfaces/editorinterface.h
View file @
de4951b5
...
@@ -17,9 +17,10 @@ struct EditorComponent {
...
@@ -17,9 +17,10 @@ struct EditorComponent {
class
EditorInterface
class
EditorInterface
{
{
public:
public:
virtual
struct
EditorComponent
newDocument
(
const
QString
&
analizerName
=
"Analizer"
,
virtual
struct
EditorComponent
newDocument
(
const
QString
&
analizerName
,
const
QString
&
initialText
=
""
,
const
QString
&
initialText
,
bool
initiallyNotSaved
=
false
const
QString
&
documentDir
,
bool
initiallyNotSaved
)
=
0
;
)
=
0
;
virtual
void
closeDocument
(
int
documentId
)
=
0
;
virtual
void
closeDocument
(
int
documentId
)
=
0
;
virtual
int
analizerDocumentId
(
int
editorDocumentId
)
const
=
0
;
virtual
int
analizerDocumentId
(
int
editorDocumentId
)
const
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment