Revision: 18060
Author: [email protected]
Date: Mon Nov 25 15:21:06 2013 UTC
Log: Experimental scanner: add the Experimental stuff into the base
library build.
This is a preparation step for using the ExperimentalScanner instead of
Scanner
in all places (Parser and PreParser).
[email protected]
BUG=
Review URL: https://codereview.chromium.org/85923002
http://code.google.com/p/v8/source/detail?r=18060
Modified:
/branches/experimental/parser/src/lexer/lexer.gyp
/branches/experimental/parser/src/parser.h
/branches/experimental/parser/src/preparser.h
/branches/experimental/parser/tools/gyp/v8.gyp
=======================================
--- /branches/experimental/parser/src/lexer/lexer.gyp Fri Nov 22 14:18:15
2013 UTC
+++ /branches/experimental/parser/src/lexer/lexer.gyp Mon Nov 25 15:21:06
2013 UTC
@@ -37,6 +37,7 @@
'type': 'executable',
'dependencies': [
'../../tools/gyp/v8.gyp:v8',
+ '../../tools/gyp/v8.gyp:generated-lexer',
],
# Generated source files need this explicitly:
'include_dirs+': [
@@ -57,62 +58,6 @@
'<(icu_gyp_path):icuuc',
],
}],
- ],
- 'actions': [
- {
- 'action_name': 'codegen_8',
- 'inputs': [
- '../../src/lexer/lexer_py.re',
- '../../tools/lexer_generator/*.py',
- '../../tools/lexer_generator/*.jinja',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_latin1.cc',
- ],
- 'action': [
- 'python',
- '../../tools/lexer_generator/generator.py',
- '--re=../../src/lexer/lexer_py.re',
- '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_latin1.cc',
- '--encoding=latin1',
- ],
- },
- {
- 'action_name': 'codegen_16',
- 'inputs': [
- '../../src/lexer/lexer_py.re',
- '../../tools/lexer_generator/*.py',
- '../../tools/lexer_generator/*.jinja',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf16.cc',
- ],
- 'action': [
- 'python',
- '../../tools/lexer_generator/generator.py',
- '--re=../../src/lexer/lexer_py.re',
- '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf16.cc',
- '--encoding=utf16',
- ],
- },
- {
- 'action_name': 'codegen_utf8',
- 'inputs': [
- '../../src/lexer/lexer_py.re',
- '../../tools/lexer_generator/*.py',
- '../../tools/lexer_generator/*.jinja',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf8.cc',
- ],
- 'action': [
- 'python',
- '../../tools/lexer_generator/generator.py',
- '--re=../../src/lexer/lexer_py.re',
- '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf8.cc',
- '--encoding=utf8',
- ],
- },
],
},
],
=======================================
--- /branches/experimental/parser/src/parser.h Wed Nov 13 13:43:01 2013 UTC
+++ /branches/experimental/parser/src/parser.h Mon Nov 25 15:21:06 2013 UTC
@@ -30,6 +30,7 @@
#include "allocation.h"
#include "ast.h"
+#include "lexer/experimental-scanner.h"
#include "preparse-data-format.h"
#include "preparse-data.h"
#include "scopes.h"
=======================================
--- /branches/experimental/parser/src/preparser.h Thu Oct 24 13:17:05 2013
UTC
+++ /branches/experimental/parser/src/preparser.h Mon Nov 25 15:21:06 2013
UTC
@@ -29,6 +29,7 @@
#define V8_PREPARSER_H
#include "hashmap.h"
+#include "lexer/experimental-scanner.h"
#include "token.h"
#include "scanner.h"
=======================================
--- /branches/experimental/parser/tools/gyp/v8.gyp Wed Nov 13 13:43:01 2013
UTC
+++ /branches/experimental/parser/tools/gyp/v8.gyp Mon Nov 25 15:21:06 2013
UTC
@@ -201,14 +201,78 @@
}],
]
},
+ {
+ 'target_name': 'generated-lexer',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'codegen_8',
+ 'inputs': [
+ '../../src/lexer/lexer_py.re',
+ '../../tools/lexer_generator/*.py',
+ '../../tools/lexer_generator/*.jinja',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_latin1.cc',
+ ],
+ 'action': [
+ 'python',
+ '../../tools/lexer_generator/generator.py',
+ '--re=../../src/lexer/lexer_py.re',
+ '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_latin1.cc',
+ '--encoding=latin1',
+ ],
+ },
+ {
+ 'action_name': 'codegen_16',
+ 'inputs': [
+ '../../src/lexer/lexer_py.re',
+ '../../tools/lexer_generator/*.py',
+ '../../tools/lexer_generator/*.jinja',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf16.cc',
+ ],
+ 'action': [
+ 'python',
+ '../../tools/lexer_generator/generator.py',
+ '--re=../../src/lexer/lexer_py.re',
+ '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf16.cc',
+ '--encoding=utf16',
+ ],
+ },
+ {
+ 'action_name': 'codegen_utf8',
+ 'inputs': [
+ '../../src/lexer/lexer_py.re',
+ '../../tools/lexer_generator/*.py',
+ '../../tools/lexer_generator/*.jinja',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf8.cc',
+ ],
+ 'action': [
+ 'python',
+ '../../tools/lexer_generator/generator.py',
+ '--re=../../src/lexer/lexer_py.re',
+ '--code=<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf8.cc',
+ '--encoding=utf8',
+ ],
+ },
+ ],
+ },
{
'target_name': 'v8_base.<(v8_target_arch)',
'type': 'static_library',
+ 'dependencies': [
+ 'generated-lexer',
+ ],
'variables': {
'optimize': 'max',
},
'include_dirs+': [
'../../src',
+ '../../include',
],
'sources': [ ### gcmole(all) ###
'../../src/accessors.cc',
@@ -406,6 +470,7 @@
'../../src/jsregexp.cc',
'../../src/jsregexp.h',
'../../src/lazy-instance.h',
+ '../../src/lexer/experimental-scanner.h',
'../../src/list-inl.h',
'../../src/list.h',
'../../src/lithium-allocator-inl.h',
@@ -560,6 +625,9 @@
'../../src/zone-inl.h',
'../../src/zone.cc',
'../../src/zone.h',
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_latin1.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf16.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/generated_lexer_utf8.cc',
],
'conditions': [
['want_separate_host_toolset==1', {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
