Rename formcalc files to better match contents
Most files match the contents. The expression files are named to match
their base type even though they contain all the expression
subclasses.
Change-Id: I3b7705c7b206a9fa1afae8b677f765e8b788e84d
Reviewed-on: https://pdfium-review.googlesource.com/5492
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 3a26007..7b7e120 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1663,20 +1663,20 @@
"xfa/fxfa/cxfa_widgetacc.h",
"xfa/fxfa/cxfa_widgetacciterator.cpp",
"xfa/fxfa/cxfa_widgetacciterator.h",
- "xfa/fxfa/fm2js/xfa_error.cpp",
- "xfa/fxfa/fm2js/xfa_error.h",
- "xfa/fxfa/fm2js/xfa_expression.cpp",
- "xfa/fxfa/fm2js/xfa_expression.h",
- "xfa/fxfa/fm2js/xfa_fm2jscontext.cpp",
- "xfa/fxfa/fm2js/xfa_fm2jscontext.h",
- "xfa/fxfa/fm2js/xfa_fmparse.cpp",
- "xfa/fxfa/fm2js/xfa_fmparse.h",
- "xfa/fxfa/fm2js/xfa_lexer.cpp",
- "xfa/fxfa/fm2js/xfa_lexer.h",
- "xfa/fxfa/fm2js/xfa_program.cpp",
- "xfa/fxfa/fm2js/xfa_program.h",
- "xfa/fxfa/fm2js/xfa_simpleexpression.cpp",
- "xfa/fxfa/fm2js/xfa_simpleexpression.h",
+ "xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp",
+ "xfa/fxfa/fm2js/cxfa_fm2jscontext.h",
+ "xfa/fxfa/fm2js/cxfa_fmerrorinfo.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmerrorinfo.h",
+ "xfa/fxfa/fm2js/cxfa_fmexpression.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmexpression.h",
+ "xfa/fxfa/fm2js/cxfa_fmlexer.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmlexer.h",
+ "xfa/fxfa/fm2js/cxfa_fmparse.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmparse.h",
+ "xfa/fxfa/fm2js/cxfa_fmprogram.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmprogram.h",
+ "xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h",
"xfa/fxfa/fxfa.h",
"xfa/fxfa/fxfa_basic.h",
"xfa/fxfa/parser/cscript_datawindow.cpp",
@@ -1910,8 +1910,8 @@
"xfa/fxfa/app/cxfa_textparser_unittest.cpp",
"xfa/fxfa/app/xfa_ffbarcode_unittest.cpp",
"xfa/fxfa/cxfa_ffapp_unittest.cpp",
- "xfa/fxfa/fm2js/xfa_lexer_unittest.cpp",
- "xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmlexer_unittest.cpp",
+ "xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp",
"xfa/fxfa/parser/xfa_utils_unittest.cpp",
]
}
diff --git a/testing/libfuzzer/pdf_fm2js_fuzzer.cc b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
index 2f5b3ea..8cc98fc 100644
--- a/testing/libfuzzer/pdf_fm2js_fuzzer.cc
+++ b/testing/libfuzzer/pdf_fm2js_fuzzer.cc
@@ -8,7 +8,7 @@
#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/fm2js/xfa_program.h"
+#include "xfa/fxfa/fm2js/cxfa_fmprogram.h"
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
FX_SAFE_STRSIZE safe_size = size;
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
rename to xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
index 7deab86..c9c0f4a 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
+#include "xfa/fxfa/fm2js/cxfa_fm2jscontext.h"
#include <time.h>
@@ -18,7 +18,7 @@
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
#include "xfa/fxfa/app/xfa_ffnotify.h"
-#include "xfa/fxfa/fm2js/xfa_program.h"
+#include "xfa/fxfa/fm2js/cxfa_fmprogram.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_localevalue.h"
#include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_fm2jscontext.h
rename to xfa/fxfa/fm2js/cxfa_fm2jscontext.h
index 6508852..0de3cc7 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h
+++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
-#define XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FM2JSCONTEXT_H_
+#define XFA_FXFA_FM2JS_CXFA_FM2JSCONTEXT_H_
#include <memory>
#include <vector>
@@ -452,4 +452,4 @@
CXFA_Document* const m_pDocument;
};
-#endif // XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FM2JSCONTEXT_H_
diff --git a/xfa/fxfa/fm2js/xfa_error.cpp b/xfa/fxfa/fm2js/cxfa_fmerrorinfo.cpp
similarity index 95%
rename from xfa/fxfa/fm2js/xfa_error.cpp
rename to xfa/fxfa/fm2js/cxfa_fmerrorinfo.cpp
index 5a76d61..3e2d5f8 100644
--- a/xfa/fxfa/fm2js/xfa_error.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmerrorinfo.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_error.h"
+#include "xfa/fxfa/fm2js/cxfa_fmerrorinfo.h"
const wchar_t kFMErrUnsupportedChar[] = L"unsupported char '%c'";
const wchar_t kFMErrBadSuffixNumber[] = L"bad suffix on number";
diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/cxfa_fmerrorinfo.h
similarity index 86%
rename from xfa/fxfa/fm2js/xfa_error.h
rename to xfa/fxfa/fm2js/cxfa_fmerrorinfo.h
index 27ed187..c9d9510 100644
--- a/xfa/fxfa/fm2js/xfa_error.h
+++ b/xfa/fxfa/fm2js/cxfa_fmerrorinfo.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_ERROR_H_
-#define XFA_FXFA_FM2JS_XFA_ERROR_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMERRORINFO_H_
+#define XFA_FXFA_FM2JS_CXFA_FMERRORINFO_H_
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
@@ -28,4 +28,4 @@
CFX_WideString message;
};
-#endif // XFA_FXFA_FM2JS_XFA_ERROR_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMERRORINFO_H_
diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_expression.cpp
rename to xfa/fxfa/fm2js/cxfa_fmexpression.cpp
index 324038f..78f6a1f 100644
--- a/xfa/fxfa/fm2js/xfa_expression.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_expression.h"
+#include "xfa/fxfa/fm2js/cxfa_fmexpression.h"
#include <utility>
diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/cxfa_fmexpression.h
similarity index 97%
rename from xfa/fxfa/fm2js/xfa_expression.h
rename to xfa/fxfa/fm2js/cxfa_fmexpression.h
index e6022b3..c04bc2f 100644
--- a/xfa/fxfa/fm2js/xfa_expression.h
+++ b/xfa/fxfa/fm2js/cxfa_fmexpression.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_EXPRESSION_H_
-#define XFA_FXFA_FM2JS_XFA_EXPRESSION_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMEXPRESSION_H_
+#define XFA_FXFA_FM2JS_CXFA_FMEXPRESSION_H_
#include <memory>
#include <vector>
-#include "xfa/fxfa/fm2js/xfa_simpleexpression.h"
+#include "xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h"
enum XFA_FM_EXPTYPE {
XFA_FM_EXPTYPE_UNKNOWN,
@@ -211,4 +211,4 @@
std::unique_ptr<CXFA_FMExpression> m_pList;
};
-#endif // XFA_FXFA_FM2JS_XFA_EXPRESSION_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMEXPRESSION_H_
diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_lexer.cpp
rename to xfa/fxfa/fm2js/cxfa_fmlexer.cpp
index be3bb29..18f915f 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_lexer.h"
+#include "xfa/fxfa/fm2js/cxfa_fmlexer.h"
#include "core/fxcrt/fx_extension.h"
#include "third_party/base/ptr_util.h"
diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/cxfa_fmlexer.h
similarity index 93%
rename from xfa/fxfa/fm2js/xfa_lexer.h
rename to xfa/fxfa/fm2js/cxfa_fmlexer.h
index 7de76d7..4baa4a5 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.h
+++ b/xfa/fxfa/fm2js/cxfa_fmlexer.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_LEXER_H_
-#define XFA_FXFA_FM2JS_XFA_LEXER_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMLEXER_H_
+#define XFA_FXFA_FM2JS_CXFA_FMLEXER_H_
#include <memory>
#include <utility>
#include "core/fxcrt/fx_string.h"
-#include "xfa/fxfa/fm2js/xfa_error.h"
+#include "xfa/fxfa/fm2js/cxfa_fmerrorinfo.h"
enum XFA_FM_TOKEN {
TOKand,
@@ -134,4 +134,4 @@
CXFA_FMErrorInfo* m_pErrorInfo;
};
-#endif // XFA_FXFA_FM2JS_XFA_LEXER_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMLEXER_H_
diff --git a/xfa/fxfa/fm2js/xfa_lexer_unittest.cpp b/xfa/fxfa/fm2js/cxfa_fmlexer_unittest.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_lexer_unittest.cpp
rename to xfa/fxfa/fm2js/cxfa_fmlexer_unittest.cpp
index fac0c9a..f47e985 100644
--- a/xfa/fxfa/fm2js/xfa_lexer_unittest.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmlexer_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "xfa/fxfa/fm2js/xfa_lexer.h"
+#include "xfa/fxfa/fm2js/cxfa_fmlexer.h"
#include <vector>
diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/cxfa_fmparse.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_fmparse.cpp
rename to xfa/fxfa/fm2js/cxfa_fmparse.cpp
index 4f6f6ba..cac7ad1 100644
--- a/xfa/fxfa/fm2js/xfa_fmparse.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmparse.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_fmparse.h"
+#include "xfa/fxfa/fm2js/cxfa_fmparse.h"
#include <memory>
#include <utility>
diff --git a/xfa/fxfa/fm2js/xfa_fmparse.h b/xfa/fxfa/fm2js/cxfa_fmparse.h
similarity index 91%
rename from xfa/fxfa/fm2js/xfa_fmparse.h
rename to xfa/fxfa/fm2js/cxfa_fmparse.h
index e49fbf2..43a4450 100644
--- a/xfa/fxfa/fm2js/xfa_fmparse.h
+++ b/xfa/fxfa/fm2js/cxfa_fmparse.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_FMPARSE_H_
-#define XFA_FXFA_FM2JS_XFA_FMPARSE_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMPARSE_H_
+#define XFA_FXFA_FM2JS_CXFA_FMPARSE_H_
#include <memory>
#include <vector>
-#include "xfa/fxfa/fm2js/xfa_expression.h"
-#include "xfa/fxfa/fm2js/xfa_lexer.h"
+#include "xfa/fxfa/fm2js/cxfa_fmexpression.h"
+#include "xfa/fxfa/fm2js/cxfa_fmlexer.h"
class CXFA_FMParse {
public:
@@ -55,4 +55,4 @@
CXFA_FMErrorInfo* const m_pErrorInfo;
};
-#endif // XFA_FXFA_FM2JS_XFA_FMPARSE_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMPARSE_H_
diff --git a/xfa/fxfa/fm2js/xfa_program.cpp b/xfa/fxfa/fm2js/cxfa_fmprogram.cpp
similarity index 96%
rename from xfa/fxfa/fm2js/xfa_program.cpp
rename to xfa/fxfa/fm2js/cxfa_fmprogram.cpp
index 8e5aa5e..6e6385d 100644
--- a/xfa/fxfa/fm2js/xfa_program.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmprogram.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_program.h"
+#include "xfa/fxfa/fm2js/cxfa_fmprogram.h"
#include <utility>
#include <vector>
diff --git a/xfa/fxfa/fm2js/xfa_program.h b/xfa/fxfa/fm2js/cxfa_fmprogram.h
similarity index 73%
rename from xfa/fxfa/fm2js/xfa_program.h
rename to xfa/fxfa/fm2js/cxfa_fmprogram.h
index 641c72f..e2a8a98 100644
--- a/xfa/fxfa/fm2js/xfa_program.h
+++ b/xfa/fxfa/fm2js/cxfa_fmprogram.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_PROGRAM_H_
-#define XFA_FXFA_FM2JS_XFA_PROGRAM_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMPROGRAM_H_
+#define XFA_FXFA_FM2JS_CXFA_FMPROGRAM_H_
#include <memory>
-#include "xfa/fxfa/fm2js/xfa_error.h"
-#include "xfa/fxfa/fm2js/xfa_fmparse.h"
+#include "xfa/fxfa/fm2js/cxfa_fmerrorinfo.h"
+#include "xfa/fxfa/fm2js/cxfa_fmparse.h"
class CXFA_FMProgram {
public:
@@ -26,4 +26,4 @@
std::unique_ptr<CXFA_FMFunctionDefinition> m_globalFunction;
};
-#endif // XFA_FXFA_FM2JS_XFA_PROGRAM_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMPROGRAM_H_
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp
similarity index 99%
rename from xfa/fxfa/fm2js/xfa_simpleexpression.cpp
rename to xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp
index 1438ff2..3b4dc70 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "xfa/fxfa/fm2js/xfa_simpleexpression.h"
+#include "xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h"
#include <utility>
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h
similarity index 97%
rename from xfa/fxfa/fm2js/xfa_simpleexpression.h
rename to xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h
index cb40e2b..e6d3941 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.h
+++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
-#define XFA_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#ifndef XFA_FXFA_FM2JS_CXFA_FMSIMPLEEXPRESSION_H_
+#define XFA_FXFA_FM2JS_CXFA_FMSIMPLEEXPRESSION_H_
#include <memory>
#include <vector>
#include "core/fxcrt/fx_basic.h"
-#include "xfa/fxfa/fm2js/xfa_lexer.h"
+#include "xfa/fxfa/fm2js/cxfa_fmlexer.h"
#define RUNTIMEFUNCTIONRETURNVALUE \
(L"foxit_xfa_formcalc_runtime_func_return_value")
@@ -305,4 +305,4 @@
bool CFXA_IsTooBig(const CFX_WideTextBuf& javascript);
-#endif // XFA_FXFA_FM2JS_XFA_SIMPLEEXPRESSION_H_
+#endif // XFA_FXFA_FM2JS_CXFA_FMSIMPLEEXPRESSION_H_
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp
similarity index 96%
rename from xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
rename to xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp
index b1b96e0..f11459b 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmsimpleexpression_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "xfa/fxfa/fm2js/xfa_simpleexpression.h"
+#include "xfa/fxfa/fm2js/cxfa_fmsimpleexpression.h"
#include <memory>
#include <utility>
@@ -11,7 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"
#include "third_party/base/ptr_util.h"
-#include "xfa/fxfa/fm2js/xfa_lexer.h"
+#include "xfa/fxfa/fm2js/cxfa_fmlexer.h"
TEST(FMCallExpressionTest, more_than_32_arguments) {
// Use sign as it has 3 object parameters at positions 0, 5, and 6.
diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h
index 4a497ca..d3a9609 100644
--- a/xfa/fxfa/parser/cxfa_scriptcontext.h
+++ b/xfa/fxfa/parser/cxfa_scriptcontext.h
@@ -13,7 +13,7 @@
#include "fxjs/cfxjse_arguments.h"
#include "xfa/fxfa/cxfa_eventparam.h"
-#include "xfa/fxfa/fm2js/xfa_fm2jscontext.h"
+#include "xfa/fxfa/fm2js/cxfa_fm2jscontext.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/xfa_resolvenode_rs.h"
