Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
393068be
Kaydet (Commit)
393068be
authored
Mar 20, 2014
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Some cosmetics.
Change-Id: I4825d94c58d8cfb245f110b7f46397c2724436a3
üst
aa99ae09
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
12 deletions
+25
-12
formulagroup.hxx
sc/inc/formulagroup.hxx
+3
-0
formulagroupcl.cxx
sc/source/core/opencl/formulagroupcl.cxx
+14
-12
formulagroup.cxx
sc/source/core/tool/formulagroup.cxx
+8
-0
No files found.
sc/inc/formulagroup.hxx
Dosyayı görüntüle @
393068be
...
@@ -74,6 +74,9 @@ struct FormulaGroupContext : boost::noncopyable
...
@@ -74,6 +74,9 @@ struct FormulaGroupContext : boost::noncopyable
void
ensureStrArray
(
ColArray
&
rColArray
,
size_t
nArrayLen
);
void
ensureStrArray
(
ColArray
&
rColArray
,
size_t
nArrayLen
);
void
ensureNumArray
(
ColArray
&
rColArray
,
size_t
nArrayLen
);
void
ensureNumArray
(
ColArray
&
rColArray
,
size_t
nArrayLen
);
FormulaGroupContext
();
~
FormulaGroupContext
();
};
};
/**
/**
...
...
sc/source/core/opencl/formulagroupcl.cxx
Dosyayı görüntüle @
393068be
...
@@ -3372,24 +3372,23 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
...
@@ -3372,24 +3372,23 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
sal_uInt8
nParamCount
=
pCur
->
GetParamCount
();
sal_uInt8
nParamCount
=
pCur
->
GetParamCount
();
for
(
sal_uInt8
i
=
0
;
i
<
nParamCount
;
i
++
)
for
(
sal_uInt8
i
=
0
;
i
<
nParamCount
;
i
++
)
{
{
FormulaToken
*
m_
TempFormula
=
aTokenList
.
back
();
FormulaToken
*
p
TempFormula
=
aTokenList
.
back
();
aTokenList
.
pop_back
();
aTokenList
.
pop_back
();
if
(
m_TempFormula
->
GetOpCode
()
!=
ocPush
)
if
(
pTempFormula
->
GetOpCode
()
!=
ocPush
)
{
{
if
(
aHashMap
.
find
(
m_
TempFormula
)
==
aHashMap
.
end
())
if
(
aHashMap
.
find
(
p
TempFormula
)
==
aHashMap
.
end
())
return
NULL
;
return
NULL
;
pCurNode
->
Children
.
push_back
(
aHashMap
[
m_
TempFormula
]);
pCurNode
->
Children
.
push_back
(
aHashMap
[
p
TempFormula
]);
}
}
else
else
{
{
FormulaTreeNodeRef
m_
ChildTreeNode
=
FormulaTreeNodeRef
p
ChildTreeNode
=
FormulaTreeNodeRef
(
FormulaTreeNodeRef
(
new
FormulaTreeNode
(
m_
TempFormula
));
new
FormulaTreeNode
(
p
TempFormula
));
pCurNode
->
Children
.
push_back
(
m_
ChildTreeNode
);
pCurNode
->
Children
.
push_back
(
p
ChildTreeNode
);
}
}
}
}
std
::
reverse
(
pCurNode
->
Children
.
begin
(),
std
::
reverse
(
pCurNode
->
Children
.
begin
(),
pCurNode
->
Children
.
end
());
pCurNode
->
Children
.
end
());
aHashMap
[
pCur
]
=
pCurNode
;
aHashMap
[
pCur
]
=
pCurNode
;
}
}
aTokenList
.
push_back
(
pCur
);
aTokenList
.
push_back
(
pCur
);
...
@@ -3404,11 +3403,13 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
...
@@ -3404,11 +3403,13 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
return
NULL
;
return
NULL
;
// OpenCL source code generation and kernel compilation
// OpenCL source code generation and kernel compilation
try
{
try
{
pDynamicKernel
->
CodeGen
();
pDynamicKernel
->
CodeGen
();
pDynamicKernel
->
CreateKernel
();
pDynamicKernel
->
CreateKernel
();
}
}
catch
(
const
UnhandledToken
&
ut
)
{
catch
(
const
UnhandledToken
&
ut
)
{
std
::
cerr
<<
"
\n
Dynamic formual compiler: unhandled token: "
;
std
::
cerr
<<
"
\n
Dynamic formual compiler: unhandled token: "
;
std
::
cerr
<<
ut
.
mMessage
<<
" at "
;
std
::
cerr
<<
ut
.
mMessage
<<
" at "
;
std
::
cerr
<<
ut
.
mFile
<<
":"
<<
ut
.
mLineNumber
<<
"
\n
"
;
std
::
cerr
<<
ut
.
mFile
<<
":"
<<
ut
.
mLineNumber
<<
"
\n
"
;
...
@@ -3419,7 +3420,8 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
...
@@ -3419,7 +3420,8 @@ DynamicKernel* DynamicKernel::create(ScDocument& /* rDoc */,
return
NULL
;
return
NULL
;
#endif
#endif
}
}
catch
(...)
{
catch
(...)
{
std
::
cerr
<<
"Dynamic formula compiler: unhandled compiler error
\n
"
;
std
::
cerr
<<
"Dynamic formula compiler: unhandled compiler error
\n
"
;
return
NULL
;
return
NULL
;
}
}
...
...
sc/source/core/tool/formulagroup.cxx
Dosyayı görüntüle @
393068be
...
@@ -129,6 +129,14 @@ void FormulaGroupContext::ensureNumArray( ColArray& rColArray, size_t nArrayLen
...
@@ -129,6 +129,14 @@ void FormulaGroupContext::ensureNumArray( ColArray& rColArray, size_t nArrayLen
rColArray
.
mpNumArray
=
&
maNumArrays
.
back
();
rColArray
.
mpNumArray
=
&
maNumArrays
.
back
();
}
}
FormulaGroupContext
::
FormulaGroupContext
()
{
}
FormulaGroupContext
::~
FormulaGroupContext
()
{
}
namespace
{
namespace
{
/**
/**
...
...
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