zeroc-ice 3.7.5 → 3.7.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ext/Config.h +3 -0
- data/ext/ice/cpp/include/Ice/Exception.h +3 -3
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +1 -1
- data/ext/ice/cpp/include/Ice/Object.h +5 -0
- data/ext/ice/cpp/include/Ice/Service.h +1 -1
- data/ext/ice/cpp/include/IceSSL/Plugin.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Config.h +3 -2
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Connection.h +45 -2
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Current.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +38 -2
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Identity.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +62 -2
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +464 -68
- data/ext/ice/cpp/include/generated/Ice/Locator.h +55 -7
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Logger.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +63 -11
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Process.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/Properties.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +21 -3
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +8 -2
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +2 -2
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +14 -2
- data/ext/ice/cpp/include/generated/Ice/Version.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +7 -2
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +2 -2
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +7 -2
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Communicator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Current.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +2 -2
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Identity.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/InputStream.cpp +10 -10
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +2 -2
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LocalException.cpp +398 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +32 -2
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Logger.cpp +2 -2
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Metrics.cpp +8 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Plugin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PluginF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Process.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Properties.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +1 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +8 -2
- data/ext/ice/cpp/src/Ice/Router.cpp +2 -2
- data/ext/ice/cpp/src/Ice/RouterF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +14 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +2 -2
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +14 -2
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +4 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +104 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +114 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.h +10 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +101 -2
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +113 -72
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -0
- data/ext/ice/cpp/src/IceUtil/Time.cpp +2 -2
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +6 -2
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +8 -0
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +4 -0
- data/ext/ice/cpp/src/Slice/Scanner.cpp +620 -368
- data/ext/ice/mcpp/CMakeLists.txt +80 -0
- data/ext/ice/mcpp/expand.c +6 -6
- data/ice.gemspec +1 -1
- data/lib/Glacier2/Metrics.rb +1 -1
- data/lib/Glacier2/PermissionsVerifier.rb +1 -1
- data/lib/Glacier2/PermissionsVerifierF.rb +1 -1
- data/lib/Glacier2/Router.rb +1 -1
- data/lib/Glacier2/RouterF.rb +1 -1
- data/lib/Glacier2/SSLInfo.rb +1 -1
- data/lib/Glacier2/Session.rb +1 -1
- data/lib/Ice/BuiltinSequences.rb +1 -1
- data/lib/Ice/Communicator.rb +1 -1
- data/lib/Ice/CommunicatorF.rb +1 -1
- data/lib/Ice/Connection.rb +1 -1
- data/lib/Ice/ConnectionF.rb +1 -1
- data/lib/Ice/Current.rb +1 -1
- data/lib/Ice/Endpoint.rb +1 -1
- data/lib/Ice/EndpointF.rb +1 -1
- data/lib/Ice/EndpointTypes.rb +1 -1
- data/lib/Ice/FacetMap.rb +1 -1
- data/lib/Ice/Identity.rb +1 -1
- data/lib/Ice/ImplicitContext.rb +1 -1
- data/lib/Ice/ImplicitContextF.rb +1 -1
- data/lib/Ice/Instrumentation.rb +1 -1
- data/lib/Ice/InstrumentationF.rb +1 -1
- data/lib/Ice/LocalException.rb +1 -1
- data/lib/Ice/Locator.rb +1 -1
- data/lib/Ice/LocatorF.rb +1 -1
- data/lib/Ice/Logger.rb +1 -1
- data/lib/Ice/LoggerF.rb +1 -1
- data/lib/Ice/Metrics.rb +1 -1
- data/lib/Ice/ObjectAdapter.rb +1 -1
- data/lib/Ice/ObjectAdapterF.rb +1 -1
- data/lib/Ice/ObjectFactory.rb +1 -1
- data/lib/Ice/Plugin.rb +1 -1
- data/lib/Ice/PluginF.rb +1 -1
- data/lib/Ice/Process.rb +1 -1
- data/lib/Ice/ProcessF.rb +1 -1
- data/lib/Ice/Properties.rb +1 -1
- data/lib/Ice/PropertiesAdmin.rb +1 -1
- data/lib/Ice/PropertiesF.rb +1 -1
- data/lib/Ice/RemoteLogger.rb +1 -1
- data/lib/Ice/Router.rb +1 -1
- data/lib/Ice/RouterF.rb +1 -1
- data/lib/Ice/ServantLocator.rb +1 -1
- data/lib/Ice/ServantLocatorF.rb +1 -1
- data/lib/Ice/SliceChecksumDict.rb +1 -1
- data/lib/Ice/ValueFactory.rb +1 -1
- data/lib/Ice/Version.rb +1 -1
- data/lib/IceBox/IceBox.rb +1 -1
- data/lib/IceGrid/Admin.rb +1 -1
- data/lib/IceGrid/Descriptor.rb +1 -1
- data/lib/IceGrid/Exception.rb +1 -1
- data/lib/IceGrid/FileParser.rb +1 -1
- data/lib/IceGrid/PluginFacade.rb +1 -1
- data/lib/IceGrid/Registry.rb +1 -1
- data/lib/IceGrid/Session.rb +1 -1
- data/lib/IceGrid/UserAccountMapper.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +1 -1
- data/lib/IcePatch2/FileServer.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +1 -1
- data/lib/IceStorm/Metrics.rb +1 -1
- metadata +4 -4
@@ -246,7 +246,7 @@ IceUtil::Time::toDateTime() const
|
|
246
246
|
os << toString("%x %H:%M:%S") << ".";
|
247
247
|
os.fill('0');
|
248
248
|
os.width(3);
|
249
|
-
os << static_cast<
|
249
|
+
os << static_cast<Int64>(_usec % 1000000 / 1000);
|
250
250
|
return os.str();
|
251
251
|
}
|
252
252
|
|
@@ -278,7 +278,7 @@ IceUtil::Time::toDuration() const
|
|
278
278
|
std::string
|
279
279
|
IceUtil::Time::toString(const std::string& format) const
|
280
280
|
{
|
281
|
-
time_t time = static_cast<
|
281
|
+
time_t time = static_cast<time_t>(_usec / 1000000);
|
282
282
|
|
283
283
|
struct tm tr;
|
284
284
|
#ifdef _MSC_VER
|
@@ -1196,8 +1196,8 @@ lookupKwd(const string& name)
|
|
1196
1196
|
"decltype", "default", "delete", "do", "double", "dynamic_cast",
|
1197
1197
|
"else", "enum", "explicit", "export", "extern", "false", "float", "for", "friend",
|
1198
1198
|
"goto", "if", "inline", "int", "long", "mutable", "namespace", "new", "noexcept", "not", "not_eq",
|
1199
|
-
"operator", "or", "or_eq", "private", "protected", "public", "register", "reinterpret_cast", "
|
1200
|
-
"short", "signed", "sizeof", "static", "static_assert", "static_cast", "struct", "switch",
|
1199
|
+
"operator", "or", "or_eq", "private", "protected", "public", "register", "reinterpret_cast", "requires",
|
1200
|
+
"return", "short", "signed", "sizeof", "static", "static_assert", "static_cast", "struct", "switch",
|
1201
1201
|
"template", "this", "thread_local", "throw", "true", "try", "typedef", "typeid", "typename",
|
1202
1202
|
"union", "unsigned", "using", "virtual", "void", "volatile", "wchar_t", "while", "xor", "xor_eq"
|
1203
1203
|
};
|
@@ -1257,7 +1257,11 @@ Slice::fixKwd(const string& name)
|
|
1257
1257
|
return lookupKwd(name);
|
1258
1258
|
}
|
1259
1259
|
StringList ids = splitScopedName(name);
|
1260
|
+
#ifdef ICE_CPP11_COMPILER
|
1261
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
1262
|
+
#else
|
1260
1263
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
1264
|
+
#endif
|
1261
1265
|
stringstream result;
|
1262
1266
|
for(StringList::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
1263
1267
|
{
|
@@ -868,7 +868,11 @@ Slice::JavaCompatGenerator::fixKwd(const string& name) const
|
|
868
868
|
return lookupKwd(name);
|
869
869
|
}
|
870
870
|
StringList ids = splitScopedName(name);
|
871
|
+
#ifdef ICE_CPP11_COMPILER
|
872
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
873
|
+
#else
|
871
874
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
875
|
+
#endif
|
872
876
|
stringstream result;
|
873
877
|
for(StringList::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
874
878
|
{
|
@@ -3348,7 +3352,11 @@ Slice::JavaGenerator::fixKwd(const string& name) const
|
|
3348
3352
|
return lookupKwd(name);
|
3349
3353
|
}
|
3350
3354
|
StringList ids = splitScopedName(name);
|
3355
|
+
#ifdef ICE_CPP11_COMPILER
|
3356
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
3357
|
+
#else
|
3351
3358
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
3359
|
+
#endif
|
3352
3360
|
stringstream result;
|
3353
3361
|
for(StringList::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
3354
3362
|
{
|
@@ -128,7 +128,11 @@ Slice::PHP::fixIdent(const string& ident)
|
|
128
128
|
return lookupKwd(ident);
|
129
129
|
}
|
130
130
|
vector<string> ids = splitScopedName(ident);
|
131
|
+
#ifdef ICE_CPP11_COMPILER
|
132
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
133
|
+
#else
|
131
134
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
135
|
+
#endif
|
132
136
|
stringstream result;
|
133
137
|
for(vector<string>::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
134
138
|
{
|
@@ -2999,7 +2999,11 @@ Slice::Python::fixIdent(const string& ident)
|
|
2999
2999
|
return lookupKwd(ident);
|
3000
3000
|
}
|
3001
3001
|
vector<string> ids = splitScopedName(ident);
|
3002
|
+
#ifdef ICE_CPP11_COMPILER
|
3003
|
+
transform(ids.begin(), ids.end(), ids.begin(), [](const string& id) -> string { return lookupKwd(id); });
|
3004
|
+
#else
|
3002
3005
|
transform(ids.begin(), ids.end(), ids.begin(), ptr_fun(lookupKwd));
|
3006
|
+
#endif
|
3003
3007
|
stringstream result;
|
3004
3008
|
for(vector<string>::const_iterator i = ids.begin(); i != ids.end(); ++i)
|
3005
3009
|
{
|
@@ -1,7 +1,7 @@
|
|
1
1
|
#include <IceUtil/ScannerConfig.h>
|
2
|
-
#line
|
2
|
+
#line 1 "src/Slice/Scanner.cpp"
|
3
3
|
|
4
|
-
#line
|
4
|
+
#line 3 "src/Slice/Scanner.cpp"
|
5
5
|
|
6
6
|
#define YY_INT_ALIGNED short int
|
7
7
|
|
@@ -9,11 +9,17 @@
|
|
9
9
|
|
10
10
|
#define yy_create_buffer slice__create_buffer
|
11
11
|
#define yy_delete_buffer slice__delete_buffer
|
12
|
-
#define
|
12
|
+
#define yy_scan_buffer slice__scan_buffer
|
13
|
+
#define yy_scan_string slice__scan_string
|
14
|
+
#define yy_scan_bytes slice__scan_bytes
|
13
15
|
#define yy_init_buffer slice__init_buffer
|
14
16
|
#define yy_flush_buffer slice__flush_buffer
|
15
17
|
#define yy_load_buffer_state slice__load_buffer_state
|
16
18
|
#define yy_switch_to_buffer slice__switch_to_buffer
|
19
|
+
#define yypush_buffer_state slice_push_buffer_state
|
20
|
+
#define yypop_buffer_state slice_pop_buffer_state
|
21
|
+
#define yyensure_buffer_stack slice_ensure_buffer_stack
|
22
|
+
#define yy_flex_debug slice__flex_debug
|
17
23
|
#define yyin slice_in
|
18
24
|
#define yyleng slice_leng
|
19
25
|
#define yylex slice_lex
|
@@ -28,12 +34,246 @@
|
|
28
34
|
|
29
35
|
#define FLEX_SCANNER
|
30
36
|
#define YY_FLEX_MAJOR_VERSION 2
|
31
|
-
#define YY_FLEX_MINOR_VERSION
|
32
|
-
#define YY_FLEX_SUBMINOR_VERSION
|
37
|
+
#define YY_FLEX_MINOR_VERSION 6
|
38
|
+
#define YY_FLEX_SUBMINOR_VERSION 4
|
33
39
|
#if YY_FLEX_SUBMINOR_VERSION > 0
|
34
40
|
#define FLEX_BETA
|
35
41
|
#endif
|
36
42
|
|
43
|
+
#ifdef yy_create_buffer
|
44
|
+
#define slice__create_buffer_ALREADY_DEFINED
|
45
|
+
#else
|
46
|
+
#define yy_create_buffer slice__create_buffer
|
47
|
+
#endif
|
48
|
+
|
49
|
+
#ifdef yy_delete_buffer
|
50
|
+
#define slice__delete_buffer_ALREADY_DEFINED
|
51
|
+
#else
|
52
|
+
#define yy_delete_buffer slice__delete_buffer
|
53
|
+
#endif
|
54
|
+
|
55
|
+
#ifdef yy_scan_buffer
|
56
|
+
#define slice__scan_buffer_ALREADY_DEFINED
|
57
|
+
#else
|
58
|
+
#define yy_scan_buffer slice__scan_buffer
|
59
|
+
#endif
|
60
|
+
|
61
|
+
#ifdef yy_scan_string
|
62
|
+
#define slice__scan_string_ALREADY_DEFINED
|
63
|
+
#else
|
64
|
+
#define yy_scan_string slice__scan_string
|
65
|
+
#endif
|
66
|
+
|
67
|
+
#ifdef yy_scan_bytes
|
68
|
+
#define slice__scan_bytes_ALREADY_DEFINED
|
69
|
+
#else
|
70
|
+
#define yy_scan_bytes slice__scan_bytes
|
71
|
+
#endif
|
72
|
+
|
73
|
+
#ifdef yy_init_buffer
|
74
|
+
#define slice__init_buffer_ALREADY_DEFINED
|
75
|
+
#else
|
76
|
+
#define yy_init_buffer slice__init_buffer
|
77
|
+
#endif
|
78
|
+
|
79
|
+
#ifdef yy_flush_buffer
|
80
|
+
#define slice__flush_buffer_ALREADY_DEFINED
|
81
|
+
#else
|
82
|
+
#define yy_flush_buffer slice__flush_buffer
|
83
|
+
#endif
|
84
|
+
|
85
|
+
#ifdef yy_load_buffer_state
|
86
|
+
#define slice__load_buffer_state_ALREADY_DEFINED
|
87
|
+
#else
|
88
|
+
#define yy_load_buffer_state slice__load_buffer_state
|
89
|
+
#endif
|
90
|
+
|
91
|
+
#ifdef yy_switch_to_buffer
|
92
|
+
#define slice__switch_to_buffer_ALREADY_DEFINED
|
93
|
+
#else
|
94
|
+
#define yy_switch_to_buffer slice__switch_to_buffer
|
95
|
+
#endif
|
96
|
+
|
97
|
+
#ifdef yypush_buffer_state
|
98
|
+
#define slice_push_buffer_state_ALREADY_DEFINED
|
99
|
+
#else
|
100
|
+
#define yypush_buffer_state slice_push_buffer_state
|
101
|
+
#endif
|
102
|
+
|
103
|
+
#ifdef yypop_buffer_state
|
104
|
+
#define slice_pop_buffer_state_ALREADY_DEFINED
|
105
|
+
#else
|
106
|
+
#define yypop_buffer_state slice_pop_buffer_state
|
107
|
+
#endif
|
108
|
+
|
109
|
+
#ifdef yyensure_buffer_stack
|
110
|
+
#define slice_ensure_buffer_stack_ALREADY_DEFINED
|
111
|
+
#else
|
112
|
+
#define yyensure_buffer_stack slice_ensure_buffer_stack
|
113
|
+
#endif
|
114
|
+
|
115
|
+
#ifdef yylex
|
116
|
+
#define slice_lex_ALREADY_DEFINED
|
117
|
+
#else
|
118
|
+
#define yylex slice_lex
|
119
|
+
#endif
|
120
|
+
|
121
|
+
#ifdef yyrestart
|
122
|
+
#define slice_restart_ALREADY_DEFINED
|
123
|
+
#else
|
124
|
+
#define yyrestart slice_restart
|
125
|
+
#endif
|
126
|
+
|
127
|
+
#ifdef yylex_init
|
128
|
+
#define slice_lex_init_ALREADY_DEFINED
|
129
|
+
#else
|
130
|
+
#define yylex_init slice_lex_init
|
131
|
+
#endif
|
132
|
+
|
133
|
+
#ifdef yylex_init_extra
|
134
|
+
#define slice_lex_init_extra_ALREADY_DEFINED
|
135
|
+
#else
|
136
|
+
#define yylex_init_extra slice_lex_init_extra
|
137
|
+
#endif
|
138
|
+
|
139
|
+
#ifdef yylex_destroy
|
140
|
+
#define slice_lex_destroy_ALREADY_DEFINED
|
141
|
+
#else
|
142
|
+
#define yylex_destroy slice_lex_destroy
|
143
|
+
#endif
|
144
|
+
|
145
|
+
#ifdef yyget_debug
|
146
|
+
#define slice_get_debug_ALREADY_DEFINED
|
147
|
+
#else
|
148
|
+
#define yyget_debug slice_get_debug
|
149
|
+
#endif
|
150
|
+
|
151
|
+
#ifdef yyset_debug
|
152
|
+
#define slice_set_debug_ALREADY_DEFINED
|
153
|
+
#else
|
154
|
+
#define yyset_debug slice_set_debug
|
155
|
+
#endif
|
156
|
+
|
157
|
+
#ifdef yyget_extra
|
158
|
+
#define slice_get_extra_ALREADY_DEFINED
|
159
|
+
#else
|
160
|
+
#define yyget_extra slice_get_extra
|
161
|
+
#endif
|
162
|
+
|
163
|
+
#ifdef yyset_extra
|
164
|
+
#define slice_set_extra_ALREADY_DEFINED
|
165
|
+
#else
|
166
|
+
#define yyset_extra slice_set_extra
|
167
|
+
#endif
|
168
|
+
|
169
|
+
#ifdef yyget_in
|
170
|
+
#define slice_get_in_ALREADY_DEFINED
|
171
|
+
#else
|
172
|
+
#define yyget_in slice_get_in
|
173
|
+
#endif
|
174
|
+
|
175
|
+
#ifdef yyset_in
|
176
|
+
#define slice_set_in_ALREADY_DEFINED
|
177
|
+
#else
|
178
|
+
#define yyset_in slice_set_in
|
179
|
+
#endif
|
180
|
+
|
181
|
+
#ifdef yyget_out
|
182
|
+
#define slice_get_out_ALREADY_DEFINED
|
183
|
+
#else
|
184
|
+
#define yyget_out slice_get_out
|
185
|
+
#endif
|
186
|
+
|
187
|
+
#ifdef yyset_out
|
188
|
+
#define slice_set_out_ALREADY_DEFINED
|
189
|
+
#else
|
190
|
+
#define yyset_out slice_set_out
|
191
|
+
#endif
|
192
|
+
|
193
|
+
#ifdef yyget_leng
|
194
|
+
#define slice_get_leng_ALREADY_DEFINED
|
195
|
+
#else
|
196
|
+
#define yyget_leng slice_get_leng
|
197
|
+
#endif
|
198
|
+
|
199
|
+
#ifdef yyget_text
|
200
|
+
#define slice_get_text_ALREADY_DEFINED
|
201
|
+
#else
|
202
|
+
#define yyget_text slice_get_text
|
203
|
+
#endif
|
204
|
+
|
205
|
+
#ifdef yyget_lineno
|
206
|
+
#define slice_get_lineno_ALREADY_DEFINED
|
207
|
+
#else
|
208
|
+
#define yyget_lineno slice_get_lineno
|
209
|
+
#endif
|
210
|
+
|
211
|
+
#ifdef yyset_lineno
|
212
|
+
#define slice_set_lineno_ALREADY_DEFINED
|
213
|
+
#else
|
214
|
+
#define yyset_lineno slice_set_lineno
|
215
|
+
#endif
|
216
|
+
|
217
|
+
#ifdef yywrap
|
218
|
+
#define slice_wrap_ALREADY_DEFINED
|
219
|
+
#else
|
220
|
+
#define yywrap slice_wrap
|
221
|
+
#endif
|
222
|
+
|
223
|
+
#ifdef yyalloc
|
224
|
+
#define slice_alloc_ALREADY_DEFINED
|
225
|
+
#else
|
226
|
+
#define yyalloc slice_alloc
|
227
|
+
#endif
|
228
|
+
|
229
|
+
#ifdef yyrealloc
|
230
|
+
#define slice_realloc_ALREADY_DEFINED
|
231
|
+
#else
|
232
|
+
#define yyrealloc slice_realloc
|
233
|
+
#endif
|
234
|
+
|
235
|
+
#ifdef yyfree
|
236
|
+
#define slice_free_ALREADY_DEFINED
|
237
|
+
#else
|
238
|
+
#define yyfree slice_free
|
239
|
+
#endif
|
240
|
+
|
241
|
+
#ifdef yytext
|
242
|
+
#define slice_text_ALREADY_DEFINED
|
243
|
+
#else
|
244
|
+
#define yytext slice_text
|
245
|
+
#endif
|
246
|
+
|
247
|
+
#ifdef yyleng
|
248
|
+
#define slice_leng_ALREADY_DEFINED
|
249
|
+
#else
|
250
|
+
#define yyleng slice_leng
|
251
|
+
#endif
|
252
|
+
|
253
|
+
#ifdef yyin
|
254
|
+
#define slice_in_ALREADY_DEFINED
|
255
|
+
#else
|
256
|
+
#define yyin slice_in
|
257
|
+
#endif
|
258
|
+
|
259
|
+
#ifdef yyout
|
260
|
+
#define slice_out_ALREADY_DEFINED
|
261
|
+
#else
|
262
|
+
#define yyout slice_out
|
263
|
+
#endif
|
264
|
+
|
265
|
+
#ifdef yy_flex_debug
|
266
|
+
#define slice__flex_debug_ALREADY_DEFINED
|
267
|
+
#else
|
268
|
+
#define yy_flex_debug slice__flex_debug
|
269
|
+
#endif
|
270
|
+
|
271
|
+
#ifdef yylineno
|
272
|
+
#define slice_lineno_ALREADY_DEFINED
|
273
|
+
#else
|
274
|
+
#define yylineno slice_lineno
|
275
|
+
#endif
|
276
|
+
|
37
277
|
/* First, we deal with platform-specific or compiler-specific issues. */
|
38
278
|
|
39
279
|
/* begin standard C headers. */
|
@@ -104,65 +344,61 @@ typedef unsigned int flex_uint32_t;
|
|
104
344
|
#define UINT32_MAX (4294967295U)
|
105
345
|
#endif
|
106
346
|
|
347
|
+
#ifndef SIZE_MAX
|
348
|
+
#define SIZE_MAX (~(size_t)0)
|
349
|
+
#endif
|
350
|
+
|
107
351
|
#endif /* ! C99 */
|
108
352
|
|
109
353
|
#endif /* ! FLEXINT_H */
|
110
354
|
|
111
|
-
|
112
|
-
|
113
|
-
/* The "const" storage-class-modifier is valid. */
|
114
|
-
#define YY_USE_CONST
|
355
|
+
/* begin standard C++ headers. */
|
115
356
|
|
116
|
-
|
117
|
-
|
118
|
-
/* C99 requires __STDC__ to be defined as 1. */
|
119
|
-
#if defined (__STDC__)
|
120
|
-
|
121
|
-
#define YY_USE_CONST
|
122
|
-
|
123
|
-
#endif /* defined (__STDC__) */
|
124
|
-
#endif /* ! __cplusplus */
|
125
|
-
|
126
|
-
#ifdef YY_USE_CONST
|
357
|
+
/* TODO: this is always defined, so inline it */
|
127
358
|
#define yyconst const
|
359
|
+
|
360
|
+
#if defined(__GNUC__) && __GNUC__ >= 3
|
361
|
+
#define yynoreturn __attribute__((__noreturn__))
|
128
362
|
#else
|
129
|
-
#define
|
363
|
+
#define yynoreturn
|
130
364
|
#endif
|
131
365
|
|
132
366
|
/* Returned upon end-of-file. */
|
133
367
|
#define YY_NULL 0
|
134
368
|
|
135
|
-
/* Promotes a possibly negative, possibly signed char to an
|
136
|
-
*
|
137
|
-
* we want to instead treat it as an 8-bit unsigned char, hence the
|
138
|
-
* double cast.
|
369
|
+
/* Promotes a possibly negative, possibly signed char to an
|
370
|
+
* integer in range [0..255] for use as an array index.
|
139
371
|
*/
|
140
|
-
#define YY_SC_TO_UI(c) ((
|
372
|
+
#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
|
141
373
|
|
142
374
|
/* Enter a start condition. This macro really ought to take a parameter,
|
143
375
|
* but we do it the disgusting crufty way forced on us by the ()-less
|
144
376
|
* definition of BEGIN.
|
145
377
|
*/
|
146
378
|
#define BEGIN (yy_start) = 1 + 2 *
|
147
|
-
|
148
379
|
/* Translate the current start state into a value that can be later handed
|
149
380
|
* to BEGIN to return to the state. The YYSTATE alias is for lex
|
150
381
|
* compatibility.
|
151
382
|
*/
|
152
383
|
#define YY_START (((yy_start) - 1) / 2)
|
153
384
|
#define YYSTATE YY_START
|
154
|
-
|
155
385
|
/* Action number for EOF rule of a given start state. */
|
156
386
|
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
|
157
|
-
|
158
387
|
/* Special action meaning "start processing a new file". */
|
159
|
-
#define YY_NEW_FILE
|
160
|
-
|
388
|
+
#define YY_NEW_FILE yyrestart( yyin )
|
161
389
|
#define YY_END_OF_BUFFER_CHAR 0
|
162
390
|
|
163
391
|
/* Size of default input buffer. */
|
164
392
|
#ifndef YY_BUF_SIZE
|
393
|
+
#ifdef __ia64__
|
394
|
+
/* On IA-64, the buffer size is 16k, not 8k.
|
395
|
+
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
|
396
|
+
* Ditto for the __ia64__ case accordingly.
|
397
|
+
*/
|
398
|
+
#define YY_BUF_SIZE 32768
|
399
|
+
#else
|
165
400
|
#define YY_BUF_SIZE 16384
|
401
|
+
#endif /* __ia64__ */
|
166
402
|
#endif
|
167
403
|
|
168
404
|
/* The state buf must be large enough to hold one state per character in the main buffer.
|
@@ -179,30 +415,30 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
|
|
179
415
|
typedef size_t yy_size_t;
|
180
416
|
#endif
|
181
417
|
|
182
|
-
extern
|
418
|
+
extern int yyleng;
|
183
419
|
|
184
|
-
extern FILE *
|
420
|
+
extern FILE *yyin, *yyout;
|
185
421
|
|
186
422
|
#define EOB_ACT_CONTINUE_SCAN 0
|
187
423
|
#define EOB_ACT_END_OF_FILE 1
|
188
424
|
#define EOB_ACT_LAST_MATCH 2
|
189
|
-
|
425
|
+
|
190
426
|
#define YY_LESS_LINENO(n)
|
427
|
+
#define YY_LINENO_REWIND_TO(ptr)
|
191
428
|
|
192
429
|
/* Return all but the first "n" matched characters back to the input stream. */
|
193
430
|
#define yyless(n) \
|
194
431
|
do \
|
195
432
|
{ \
|
196
|
-
/* Undo effects of setting up
|
433
|
+
/* Undo effects of setting up yytext. */ \
|
197
434
|
int yyless_macro_arg = (n); \
|
198
435
|
YY_LESS_LINENO(yyless_macro_arg);\
|
199
436
|
*yy_cp = (yy_hold_char); \
|
200
437
|
YY_RESTORE_YY_MORE_OFFSET \
|
201
438
|
(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
|
202
|
-
YY_DO_BEFORE_ACTION; /* set up
|
439
|
+
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
|
203
440
|
} \
|
204
441
|
while ( 0 )
|
205
|
-
|
206
442
|
#define unput(c) yyunput( c, (yytext_ptr) )
|
207
443
|
|
208
444
|
#ifndef YY_STRUCT_YY_BUFFER_STATE
|
@@ -217,12 +453,12 @@ struct yy_buffer_state
|
|
217
453
|
/* Size of input buffer in bytes, not including room for EOB
|
218
454
|
* characters.
|
219
455
|
*/
|
220
|
-
|
456
|
+
int yy_buf_size;
|
221
457
|
|
222
458
|
/* Number of characters read into yy_ch_buf, not including EOB
|
223
459
|
* characters.
|
224
460
|
*/
|
225
|
-
|
461
|
+
int yy_n_chars;
|
226
462
|
|
227
463
|
/* Whether we "own" the buffer - i.e., we know we created it,
|
228
464
|
* and can realloc() it to grow it, and should free() it to
|
@@ -245,7 +481,7 @@ struct yy_buffer_state
|
|
245
481
|
|
246
482
|
int yy_bs_lineno; /**< The line count. */
|
247
483
|
int yy_bs_column; /**< The column count. */
|
248
|
-
|
484
|
+
|
249
485
|
/* Whether to try to fill the input buffer when we reach the
|
250
486
|
* end of it.
|
251
487
|
*/
|
@@ -262,8 +498,8 @@ struct yy_buffer_state
|
|
262
498
|
* possible backing-up.
|
263
499
|
*
|
264
500
|
* When we actually see the EOF, we change the status to "new"
|
265
|
-
* (via
|
266
|
-
* just pointing
|
501
|
+
* (via yyrestart()), so that the user can continue scanning by
|
502
|
+
* just pointing yyin at a new input file.
|
267
503
|
*/
|
268
504
|
#define YY_BUFFER_EOF_PENDING 2
|
269
505
|
|
@@ -273,7 +509,7 @@ struct yy_buffer_state
|
|
273
509
|
/* Stack of input buffers. */
|
274
510
|
static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
|
275
511
|
static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
|
276
|
-
static YY_BUFFER_STATE * yy_buffer_stack =
|
512
|
+
static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
|
277
513
|
|
278
514
|
/* We provide macros for accessing buffer states in case in the
|
279
515
|
* future we want to put the buffer states in a more general
|
@@ -284,106 +520,101 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
|
|
284
520
|
#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
|
285
521
|
? (yy_buffer_stack)[(yy_buffer_stack_top)] \
|
286
522
|
: NULL)
|
287
|
-
|
288
523
|
/* Same as previous macro, but useful when we know that the buffer stack is not
|
289
524
|
* NULL or when we need an lvalue. For internal use only.
|
290
525
|
*/
|
291
526
|
#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
|
292
527
|
|
293
|
-
/* yy_hold_char holds the character lost when
|
528
|
+
/* yy_hold_char holds the character lost when yytext is formed. */
|
294
529
|
static char yy_hold_char;
|
295
|
-
static
|
296
|
-
|
530
|
+
static int yy_n_chars; /* number of characters read into yy_ch_buf */
|
531
|
+
int yyleng;
|
297
532
|
|
298
533
|
/* Points to current character in buffer. */
|
299
|
-
static char *yy_c_buf_p =
|
534
|
+
static char *yy_c_buf_p = NULL;
|
300
535
|
static int yy_init = 0; /* whether we need to initialize */
|
301
536
|
static int yy_start = 0; /* start state number */
|
302
537
|
|
303
|
-
/* Flag which is used to allow
|
304
|
-
* instead of setting up a fresh
|
538
|
+
/* Flag which is used to allow yywrap()'s to do buffer switches
|
539
|
+
* instead of setting up a fresh yyin. A bit of a hack ...
|
305
540
|
*/
|
306
541
|
static int yy_did_buffer_switch_on_eof;
|
307
542
|
|
308
|
-
void
|
309
|
-
void
|
310
|
-
YY_BUFFER_STATE
|
311
|
-
void
|
312
|
-
void
|
313
|
-
void
|
314
|
-
void
|
315
|
-
|
316
|
-
static void slice_ensure_buffer_stack (void );
|
317
|
-
static void slice__load_buffer_state (void );
|
318
|
-
static void slice__init_buffer (YY_BUFFER_STATE b,FILE *file );
|
543
|
+
void yyrestart ( FILE *input_file );
|
544
|
+
void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
|
545
|
+
YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
|
546
|
+
void yy_delete_buffer ( YY_BUFFER_STATE b );
|
547
|
+
void yy_flush_buffer ( YY_BUFFER_STATE b );
|
548
|
+
void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
|
549
|
+
void yypop_buffer_state ( void );
|
319
550
|
|
320
|
-
|
551
|
+
static void yyensure_buffer_stack ( void );
|
552
|
+
static void yy_load_buffer_state ( void );
|
553
|
+
static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
|
554
|
+
#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
|
321
555
|
|
322
|
-
YY_BUFFER_STATE
|
323
|
-
YY_BUFFER_STATE
|
324
|
-
YY_BUFFER_STATE
|
556
|
+
YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
|
557
|
+
YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
|
558
|
+
YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
|
325
559
|
|
326
|
-
void *
|
327
|
-
void *
|
328
|
-
void
|
329
|
-
|
330
|
-
#define yy_new_buffer slice__create_buffer
|
560
|
+
void *yyalloc ( yy_size_t );
|
561
|
+
void *yyrealloc ( void *, yy_size_t );
|
562
|
+
void yyfree ( void * );
|
331
563
|
|
564
|
+
#define yy_new_buffer yy_create_buffer
|
332
565
|
#define yy_set_interactive(is_interactive) \
|
333
566
|
{ \
|
334
567
|
if ( ! YY_CURRENT_BUFFER ){ \
|
335
|
-
|
568
|
+
yyensure_buffer_stack (); \
|
336
569
|
YY_CURRENT_BUFFER_LVALUE = \
|
337
|
-
|
570
|
+
yy_create_buffer( yyin, YY_BUF_SIZE ); \
|
338
571
|
} \
|
339
572
|
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
|
340
573
|
}
|
341
|
-
|
342
574
|
#define yy_set_bol(at_bol) \
|
343
575
|
{ \
|
344
576
|
if ( ! YY_CURRENT_BUFFER ){\
|
345
|
-
|
577
|
+
yyensure_buffer_stack (); \
|
346
578
|
YY_CURRENT_BUFFER_LVALUE = \
|
347
|
-
|
579
|
+
yy_create_buffer( yyin, YY_BUF_SIZE ); \
|
348
580
|
} \
|
349
581
|
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
|
350
582
|
}
|
351
|
-
|
352
583
|
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
|
353
584
|
|
354
585
|
/* Begin user sect3 */
|
355
586
|
|
356
|
-
#define slice_wrap() 1
|
587
|
+
#define slice_wrap() (/*CONSTCOND*/1)
|
357
588
|
#define YY_SKIP_YYWRAP
|
589
|
+
typedef flex_uint8_t YY_CHAR;
|
358
590
|
|
359
|
-
|
360
|
-
|
361
|
-
FILE *slice_in = (FILE *) 0, *slice_out = (FILE *) 0;
|
591
|
+
FILE *yyin = NULL, *yyout = NULL;
|
362
592
|
|
363
593
|
typedef int yy_state_type;
|
364
594
|
|
365
|
-
extern int
|
366
|
-
|
367
|
-
int slice_lineno = 1;
|
595
|
+
extern int yylineno;
|
596
|
+
int yylineno = 1;
|
368
597
|
|
369
|
-
extern char *
|
370
|
-
#
|
598
|
+
extern char *yytext;
|
599
|
+
#ifdef yytext_ptr
|
600
|
+
#undef yytext_ptr
|
601
|
+
#endif
|
602
|
+
#define yytext_ptr yytext
|
371
603
|
|
372
|
-
static yy_state_type yy_get_previous_state (void );
|
373
|
-
static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
|
374
|
-
static int yy_get_next_buffer (void );
|
375
|
-
static void yy_fatal_error (
|
604
|
+
static yy_state_type yy_get_previous_state ( void );
|
605
|
+
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
|
606
|
+
static int yy_get_next_buffer ( void );
|
607
|
+
static void yynoreturn yy_fatal_error ( const char* msg );
|
376
608
|
|
377
609
|
/* Done after the current pattern has been matched and before the
|
378
|
-
* corresponding action - sets up
|
610
|
+
* corresponding action - sets up yytext.
|
379
611
|
*/
|
380
612
|
#define YY_DO_BEFORE_ACTION \
|
381
613
|
(yytext_ptr) = yy_bp; \
|
382
|
-
|
614
|
+
yyleng = (int) (yy_cp - yy_bp); \
|
383
615
|
(yy_hold_char) = *yy_cp; \
|
384
616
|
*yy_cp = '\0'; \
|
385
617
|
(yy_c_buf_p) = yy_cp;
|
386
|
-
|
387
618
|
#define YY_NUM_RULES 19
|
388
619
|
#define YY_END_OF_BUFFER 20
|
389
620
|
/* This struct is not used in this scanner,
|
@@ -393,7 +624,7 @@ struct yy_trans_info
|
|
393
624
|
flex_int32_t yy_verify;
|
394
625
|
flex_int32_t yy_nxt;
|
395
626
|
};
|
396
|
-
static
|
627
|
+
static const flex_int16_t yy_accept[76] =
|
397
628
|
{ 0,
|
398
629
|
0, 0, 0, 0, 0, 0, 20, 18, 16, 16,
|
399
630
|
13, 18, 18, 18, 14, 14, 18, 12, 7, 18,
|
@@ -405,7 +636,7 @@ static yyconst flex_int16_t yy_accept[76] =
|
|
405
636
|
0, 0, 0, 4, 0
|
406
637
|
} ;
|
407
638
|
|
408
|
-
static
|
639
|
+
static const YY_CHAR yy_ec[256] =
|
409
640
|
{ 0,
|
410
641
|
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
|
411
642
|
4, 4, 4, 1, 1, 1, 1, 1, 1, 1,
|
@@ -437,7 +668,7 @@ static yyconst flex_int32_t yy_ec[256] =
|
|
437
668
|
1, 1, 1, 1, 1
|
438
669
|
} ;
|
439
670
|
|
440
|
-
static
|
671
|
+
static const YY_CHAR yy_meta[32] =
|
441
672
|
{ 0,
|
442
673
|
1, 2, 3, 1, 1, 1, 1, 1, 4, 4,
|
443
674
|
1, 1, 5, 5, 5, 1, 6, 6, 6, 7,
|
@@ -445,7 +676,7 @@ static yyconst flex_int32_t yy_meta[32] =
|
|
445
676
|
1
|
446
677
|
} ;
|
447
678
|
|
448
|
-
static
|
679
|
+
static const flex_int16_t yy_base[87] =
|
449
680
|
{ 0,
|
450
681
|
0, 140, 0, 26, 0, 139, 137, 197, 197, 197,
|
451
682
|
197, 22, 25, 33, 47, 35, 120, 74, 114, 0,
|
@@ -458,7 +689,7 @@ static yyconst flex_int16_t yy_base[87] =
|
|
458
689
|
155, 160, 168, 175, 180, 188
|
459
690
|
} ;
|
460
691
|
|
461
|
-
static
|
692
|
+
static const flex_int16_t yy_def[87] =
|
462
693
|
{ 0,
|
463
694
|
75, 1, 1, 1, 1, 1, 75, 75, 75, 75,
|
464
695
|
75, 75, 75, 75, 75, 15, 75, 75, 75, 76,
|
@@ -471,7 +702,7 @@ static yyconst flex_int16_t yy_def[87] =
|
|
471
702
|
75, 75, 75, 75, 75, 75
|
472
703
|
} ;
|
473
704
|
|
474
|
-
static
|
705
|
+
static const flex_int16_t yy_nxt[229] =
|
475
706
|
{ 0,
|
476
707
|
8, 9, 10, 9, 11, 8, 8, 8, 12, 12,
|
477
708
|
13, 14, 15, 16, 16, 17, 18, 18, 18, 18,
|
@@ -500,7 +731,7 @@ static yyconst flex_int16_t yy_nxt[229] =
|
|
500
731
|
75, 75, 75, 75, 75, 75, 75, 75
|
501
732
|
} ;
|
502
733
|
|
503
|
-
static
|
734
|
+
static const flex_int16_t yy_chk[229] =
|
504
735
|
{ 0,
|
505
736
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
506
737
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
@@ -532,8 +763,8 @@ static yyconst flex_int16_t yy_chk[229] =
|
|
532
763
|
static yy_state_type yy_last_accepting_state;
|
533
764
|
static char *yy_last_accepting_cpos;
|
534
765
|
|
535
|
-
extern int
|
536
|
-
int
|
766
|
+
extern int yy_flex_debug;
|
767
|
+
int yy_flex_debug = 0;
|
537
768
|
|
538
769
|
/* The intent behind this definition is that it'll catch
|
539
770
|
* any uses of REJECT which flex missed.
|
@@ -542,7 +773,7 @@ int slice__flex_debug = 0;
|
|
542
773
|
#define yymore() yymore_used_but_not_detected
|
543
774
|
#define YY_MORE_ADJ 0
|
544
775
|
#define YY_RESTORE_YY_MORE_OFFSET
|
545
|
-
char *
|
776
|
+
char *yytext;
|
546
777
|
#line 1 "src/Slice/Scanner.l"
|
547
778
|
#line 2 "src/Slice/Scanner.l"
|
548
779
|
|
@@ -624,9 +855,9 @@ int checkIdentifier(string&);
|
|
624
855
|
|
625
856
|
#define YY_USER_INIT initScanner();
|
626
857
|
|
858
|
+
#line 857 "src/Slice/Scanner.cpp"
|
627
859
|
|
628
|
-
|
629
|
-
#line 626 "src/Slice/Scanner.cpp"
|
860
|
+
#line 859 "src/Slice/Scanner.cpp"
|
630
861
|
|
631
862
|
#define INITIAL 0
|
632
863
|
#define BOMSCAN 1
|
@@ -644,36 +875,36 @@ int checkIdentifier(string&);
|
|
644
875
|
#define YY_EXTRA_TYPE void *
|
645
876
|
#endif
|
646
877
|
|
647
|
-
static int yy_init_globals (void );
|
878
|
+
static int yy_init_globals ( void );
|
648
879
|
|
649
880
|
/* Accessor methods to globals.
|
650
881
|
These are made visible to non-reentrant scanners for convenience. */
|
651
882
|
|
652
|
-
int
|
883
|
+
int yylex_destroy ( void );
|
653
884
|
|
654
|
-
int
|
885
|
+
int yyget_debug ( void );
|
655
886
|
|
656
|
-
void
|
887
|
+
void yyset_debug ( int debug_flag );
|
657
888
|
|
658
|
-
YY_EXTRA_TYPE
|
889
|
+
YY_EXTRA_TYPE yyget_extra ( void );
|
659
890
|
|
660
|
-
void
|
891
|
+
void yyset_extra ( YY_EXTRA_TYPE user_defined );
|
661
892
|
|
662
|
-
FILE *
|
893
|
+
FILE *yyget_in ( void );
|
663
894
|
|
664
|
-
void
|
895
|
+
void yyset_in ( FILE * _in_str );
|
665
896
|
|
666
|
-
FILE *
|
897
|
+
FILE *yyget_out ( void );
|
667
898
|
|
668
|
-
void
|
899
|
+
void yyset_out ( FILE * _out_str );
|
669
900
|
|
670
|
-
|
901
|
+
int yyget_leng ( void );
|
671
902
|
|
672
|
-
char *
|
903
|
+
char *yyget_text ( void );
|
673
904
|
|
674
|
-
int
|
905
|
+
int yyget_lineno ( void );
|
675
906
|
|
676
|
-
void
|
907
|
+
void yyset_lineno ( int _line_number );
|
677
908
|
|
678
909
|
/* Macros after this point can all be overridden by user definitions in
|
679
910
|
* section 1.
|
@@ -681,35 +912,43 @@ void slice_set_lineno (int line_number );
|
|
681
912
|
|
682
913
|
#ifndef YY_SKIP_YYWRAP
|
683
914
|
#ifdef __cplusplus
|
684
|
-
extern "C" int
|
915
|
+
extern "C" int yywrap ( void );
|
685
916
|
#else
|
686
|
-
extern int
|
917
|
+
extern int yywrap ( void );
|
687
918
|
#endif
|
688
919
|
#endif
|
689
920
|
|
690
|
-
|
921
|
+
#ifndef YY_NO_UNPUT
|
922
|
+
|
923
|
+
static void yyunput ( int c, char *buf_ptr );
|
691
924
|
|
925
|
+
#endif
|
926
|
+
|
692
927
|
#ifndef yytext_ptr
|
693
|
-
static void yy_flex_strncpy (char *,
|
928
|
+
static void yy_flex_strncpy ( char *, const char *, int );
|
694
929
|
#endif
|
695
930
|
|
696
931
|
#ifdef YY_NEED_STRLEN
|
697
|
-
static int yy_flex_strlen (
|
932
|
+
static int yy_flex_strlen ( const char * );
|
698
933
|
#endif
|
699
934
|
|
700
935
|
#ifndef YY_NO_INPUT
|
701
|
-
|
702
936
|
#ifdef __cplusplus
|
703
|
-
static int yyinput (void );
|
937
|
+
static int yyinput ( void );
|
704
938
|
#else
|
705
|
-
static int input (void );
|
939
|
+
static int input ( void );
|
706
940
|
#endif
|
707
941
|
|
708
942
|
#endif
|
709
943
|
|
710
944
|
/* Amount of stuff to slurp up with each read. */
|
711
945
|
#ifndef YY_READ_BUF_SIZE
|
946
|
+
#ifdef __ia64__
|
947
|
+
/* On IA-64, the buffer size is 16k, not 8k */
|
948
|
+
#define YY_READ_BUF_SIZE 16384
|
949
|
+
#else
|
712
950
|
#define YY_READ_BUF_SIZE 8192
|
951
|
+
#endif /* __ia64__ */
|
713
952
|
#endif
|
714
953
|
|
715
954
|
/* Copy whatever the last rule matched to the standard output. */
|
@@ -717,7 +956,7 @@ static int input (void );
|
|
717
956
|
/* This used to be an fputs(), but since the string might contain NUL's,
|
718
957
|
* we now use fwrite().
|
719
958
|
*/
|
720
|
-
#define ECHO do { if (fwrite(
|
959
|
+
#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
|
721
960
|
#endif
|
722
961
|
|
723
962
|
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
@@ -728,20 +967,20 @@ static int input (void );
|
|
728
967
|
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
729
968
|
{ \
|
730
969
|
int c = '*'; \
|
731
|
-
|
970
|
+
int n; \
|
732
971
|
for ( n = 0; n < max_size && \
|
733
|
-
(c = getc(
|
972
|
+
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
734
973
|
buf[n] = (char) c; \
|
735
974
|
if ( c == '\n' ) \
|
736
975
|
buf[n++] = (char) c; \
|
737
|
-
if ( c == EOF && ferror(
|
976
|
+
if ( c == EOF && ferror( yyin ) ) \
|
738
977
|
YY_FATAL_ERROR( "input in flex scanner failed" ); \
|
739
978
|
result = n; \
|
740
979
|
} \
|
741
980
|
else \
|
742
981
|
{ \
|
743
982
|
errno=0; \
|
744
|
-
while ( (result = fread(buf, 1, max_size,
|
983
|
+
while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
|
745
984
|
{ \
|
746
985
|
if( errno != EINTR) \
|
747
986
|
{ \
|
@@ -749,7 +988,7 @@ static int input (void );
|
|
749
988
|
break; \
|
750
989
|
} \
|
751
990
|
errno=0; \
|
752
|
-
clearerr(
|
991
|
+
clearerr(yyin); \
|
753
992
|
} \
|
754
993
|
}\
|
755
994
|
\
|
@@ -782,12 +1021,12 @@ static int input (void );
|
|
782
1021
|
#ifndef YY_DECL
|
783
1022
|
#define YY_DECL_IS_OURS 1
|
784
1023
|
|
785
|
-
extern int
|
1024
|
+
extern int yylex (void);
|
786
1025
|
|
787
|
-
#define YY_DECL int
|
1026
|
+
#define YY_DECL int yylex (void)
|
788
1027
|
#endif /* !YY_DECL */
|
789
1028
|
|
790
|
-
/* Code executed at the beginning of each rule, after
|
1029
|
+
/* Code executed at the beginning of each rule, after yytext and yyleng
|
791
1030
|
* have been set up.
|
792
1031
|
*/
|
793
1032
|
#ifndef YY_USER_ACTION
|
@@ -796,28 +1035,23 @@ extern int slice_lex (void);
|
|
796
1035
|
|
797
1036
|
/* Code executed at the end of each rule. */
|
798
1037
|
#ifndef YY_BREAK
|
799
|
-
#define YY_BREAK break;
|
1038
|
+
#define YY_BREAK /*LINTED*/break;
|
800
1039
|
#endif
|
801
1040
|
|
802
1041
|
#define YY_RULE_SETUP \
|
803
|
-
if (
|
1042
|
+
if ( yyleng > 0 ) \
|
804
1043
|
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
|
805
|
-
(
|
1044
|
+
(yytext[yyleng - 1] == '\n'); \
|
806
1045
|
YY_USER_ACTION
|
807
1046
|
|
808
1047
|
/** The main scanner function which does all the work.
|
809
1048
|
*/
|
810
1049
|
YY_DECL
|
811
1050
|
{
|
812
|
-
|
813
|
-
|
814
|
-
|
1051
|
+
yy_state_type yy_current_state;
|
1052
|
+
char *yy_cp, *yy_bp;
|
1053
|
+
int yy_act;
|
815
1054
|
|
816
|
-
#line 93 "src/Slice/Scanner.l"
|
817
|
-
|
818
|
-
|
819
|
-
#line 816 "src/Slice/Scanner.cpp"
|
820
|
-
|
821
1055
|
if ( !(yy_init) )
|
822
1056
|
{
|
823
1057
|
(yy_init) = 1;
|
@@ -829,26 +1063,32 @@ YY_DECL
|
|
829
1063
|
if ( ! (yy_start) )
|
830
1064
|
(yy_start) = 1; /* first start state */
|
831
1065
|
|
832
|
-
if ( !
|
833
|
-
|
1066
|
+
if ( ! yyin )
|
1067
|
+
yyin = stdin;
|
834
1068
|
|
835
|
-
if ( !
|
836
|
-
|
1069
|
+
if ( ! yyout )
|
1070
|
+
yyout = stdout;
|
837
1071
|
|
838
1072
|
if ( ! YY_CURRENT_BUFFER ) {
|
839
|
-
|
1073
|
+
yyensure_buffer_stack ();
|
840
1074
|
YY_CURRENT_BUFFER_LVALUE =
|
841
|
-
|
1075
|
+
yy_create_buffer( yyin, YY_BUF_SIZE );
|
842
1076
|
}
|
843
1077
|
|
844
|
-
|
1078
|
+
yy_load_buffer_state( );
|
845
1079
|
}
|
846
1080
|
|
847
|
-
|
1081
|
+
{
|
1082
|
+
#line 96 "src/Slice/Scanner.l"
|
1083
|
+
|
1084
|
+
|
1085
|
+
#line 1084 "src/Slice/Scanner.cpp"
|
1086
|
+
|
1087
|
+
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
|
848
1088
|
{
|
849
1089
|
yy_cp = (yy_c_buf_p);
|
850
1090
|
|
851
|
-
/* Support of
|
1091
|
+
/* Support of yytext. */
|
852
1092
|
*yy_cp = (yy_hold_char);
|
853
1093
|
|
854
1094
|
/* yy_bp points to the position in yy_ch_buf of the start of
|
@@ -861,7 +1101,7 @@ YY_DECL
|
|
861
1101
|
yy_match:
|
862
1102
|
do
|
863
1103
|
{
|
864
|
-
|
1104
|
+
YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
|
865
1105
|
if ( yy_accept[yy_current_state] )
|
866
1106
|
{
|
867
1107
|
(yy_last_accepting_state) = yy_current_state;
|
@@ -871,9 +1111,9 @@ yy_match:
|
|
871
1111
|
{
|
872
1112
|
yy_current_state = (int) yy_def[yy_current_state];
|
873
1113
|
if ( yy_current_state >= 76 )
|
874
|
-
yy_c = yy_meta[
|
1114
|
+
yy_c = yy_meta[yy_c];
|
875
1115
|
}
|
876
|
-
yy_current_state = yy_nxt[yy_base[yy_current_state] +
|
1116
|
+
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
877
1117
|
++yy_cp;
|
878
1118
|
}
|
879
1119
|
while ( yy_current_state != 75 );
|
@@ -897,13 +1137,13 @@ do_action: /* This label is used only to access EOF actions. */
|
|
897
1137
|
goto yy_find_action;
|
898
1138
|
|
899
1139
|
case 1:
|
900
|
-
*yy_cp = (yy_hold_char); /* undo effects of setting up
|
1140
|
+
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
|
901
1141
|
(yy_c_buf_p) = yy_cp -= 1;
|
902
|
-
YY_DO_BEFORE_ACTION; /* set up
|
1142
|
+
YY_DO_BEFORE_ACTION; /* set up yytext again */
|
903
1143
|
YY_RULE_SETUP
|
904
|
-
#line
|
1144
|
+
#line 98 "src/Slice/Scanner.l"
|
905
1145
|
{
|
906
|
-
if(unit->scanPosition(
|
1146
|
+
if(unit->scanPosition(yytext))
|
907
1147
|
{
|
908
1148
|
BEGIN(BOMSCAN);
|
909
1149
|
}
|
@@ -911,26 +1151,27 @@ YY_RULE_SETUP
|
|
911
1151
|
YY_BREAK
|
912
1152
|
case 2:
|
913
1153
|
/* rule 2 can match eol */
|
914
|
-
*yy_cp = (yy_hold_char); /* undo effects of setting up
|
1154
|
+
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
|
1155
|
+
YY_LINENO_REWIND_TO(yy_cp - 1);
|
915
1156
|
(yy_c_buf_p) = yy_cp -= 1;
|
916
|
-
YY_DO_BEFORE_ACTION; /* set up
|
1157
|
+
YY_DO_BEFORE_ACTION; /* set up yytext again */
|
917
1158
|
YY_RULE_SETUP
|
918
|
-
#line
|
1159
|
+
#line 105 "src/Slice/Scanner.l"
|
919
1160
|
{
|
920
|
-
if(unit->scanPosition(
|
1161
|
+
if(unit->scanPosition(yytext))
|
921
1162
|
{
|
922
1163
|
BEGIN(BOMSCAN);
|
923
1164
|
}
|
924
1165
|
}
|
925
1166
|
YY_BREAK
|
926
1167
|
case 3:
|
927
|
-
*yy_cp = (yy_hold_char); /* undo effects of setting up
|
1168
|
+
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
|
928
1169
|
(yy_c_buf_p) = yy_cp -= 1;
|
929
|
-
YY_DO_BEFORE_ACTION; /* set up
|
1170
|
+
YY_DO_BEFORE_ACTION; /* set up yytext again */
|
930
1171
|
YY_RULE_SETUP
|
931
|
-
#line
|
1172
|
+
#line 112 "src/Slice/Scanner.l"
|
932
1173
|
{
|
933
|
-
if(unit->scanPosition(
|
1174
|
+
if(unit->scanPosition(yytext))
|
934
1175
|
{
|
935
1176
|
BEGIN(BOMSCAN);
|
936
1177
|
}
|
@@ -938,13 +1179,14 @@ YY_RULE_SETUP
|
|
938
1179
|
YY_BREAK
|
939
1180
|
case 4:
|
940
1181
|
/* rule 4 can match eol */
|
941
|
-
*yy_cp = (yy_hold_char); /* undo effects of setting up
|
1182
|
+
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
|
1183
|
+
YY_LINENO_REWIND_TO(yy_cp - 1);
|
942
1184
|
(yy_c_buf_p) = yy_cp -= 1;
|
943
|
-
YY_DO_BEFORE_ACTION; /* set up
|
1185
|
+
YY_DO_BEFORE_ACTION; /* set up yytext again */
|
944
1186
|
YY_RULE_SETUP
|
945
|
-
#line
|
1187
|
+
#line 119 "src/Slice/Scanner.l"
|
946
1188
|
{
|
947
|
-
if(unit->scanPosition(
|
1189
|
+
if(unit->scanPosition(yytext))
|
948
1190
|
{
|
949
1191
|
BEGIN(BOMSCAN);
|
950
1192
|
}
|
@@ -952,7 +1194,7 @@ YY_RULE_SETUP
|
|
952
1194
|
YY_BREAK
|
953
1195
|
case 5:
|
954
1196
|
YY_RULE_SETUP
|
955
|
-
#line
|
1197
|
+
#line 126 "src/Slice/Scanner.l"
|
956
1198
|
{
|
957
1199
|
// C++-style comment
|
958
1200
|
BEGIN(MAINSCAN);
|
@@ -970,11 +1212,11 @@ YY_RULE_SETUP
|
|
970
1212
|
YY_BREAK
|
971
1213
|
case 6:
|
972
1214
|
YY_RULE_SETUP
|
973
|
-
#line
|
1215
|
+
#line 141 "src/Slice/Scanner.l"
|
974
1216
|
{
|
975
1217
|
// C-style comment
|
976
1218
|
BEGIN(MAINSCAN);
|
977
|
-
string comment =
|
1219
|
+
string comment = yytext + 2;
|
978
1220
|
while(true)
|
979
1221
|
{
|
980
1222
|
int c = yyinput();
|
@@ -1014,7 +1256,7 @@ YY_RULE_SETUP
|
|
1014
1256
|
YY_BREAK
|
1015
1257
|
case 7:
|
1016
1258
|
YY_RULE_SETUP
|
1017
|
-
#line
|
1259
|
+
#line 182 "src/Slice/Scanner.l"
|
1018
1260
|
{
|
1019
1261
|
BEGIN(MAINSCAN);
|
1020
1262
|
return ICE_METADATA_OPEN;
|
@@ -1022,7 +1264,7 @@ YY_RULE_SETUP
|
|
1022
1264
|
YY_BREAK
|
1023
1265
|
case 8:
|
1024
1266
|
YY_RULE_SETUP
|
1025
|
-
#line
|
1267
|
+
#line 187 "src/Slice/Scanner.l"
|
1026
1268
|
{
|
1027
1269
|
BEGIN(MAINSCAN);
|
1028
1270
|
return ICE_METADATA_CLOSE;
|
@@ -1030,7 +1272,7 @@ YY_RULE_SETUP
|
|
1030
1272
|
YY_BREAK
|
1031
1273
|
case 9:
|
1032
1274
|
YY_RULE_SETUP
|
1033
|
-
#line
|
1275
|
+
#line 192 "src/Slice/Scanner.l"
|
1034
1276
|
{
|
1035
1277
|
BEGIN(MAINSCAN);
|
1036
1278
|
return ICE_GLOBAL_METADATA_OPEN;
|
@@ -1038,7 +1280,7 @@ YY_RULE_SETUP
|
|
1038
1280
|
YY_BREAK
|
1039
1281
|
case 10:
|
1040
1282
|
YY_RULE_SETUP
|
1041
|
-
#line
|
1283
|
+
#line 197 "src/Slice/Scanner.l"
|
1042
1284
|
{
|
1043
1285
|
BEGIN(MAINSCAN);
|
1044
1286
|
return ICE_GLOBAL_METADATA_CLOSE;
|
@@ -1047,14 +1289,14 @@ YY_RULE_SETUP
|
|
1047
1289
|
case 11:
|
1048
1290
|
/* rule 11 can match eol */
|
1049
1291
|
YY_RULE_SETUP
|
1050
|
-
#line
|
1292
|
+
#line 202 "src/Slice/Scanner.l"
|
1051
1293
|
{
|
1052
1294
|
BEGIN(MAINSCAN);
|
1053
1295
|
StringTokPtr ident = new StringTok;
|
1054
|
-
ident->v = *
|
1296
|
+
ident->v = *yytext == '\\' ? yytext + 1 : yytext;
|
1055
1297
|
ident->v.erase(ident->v.find_first_of(" \t\v\n\r\f("));
|
1056
1298
|
*yylvalp = ident;
|
1057
|
-
if(*
|
1299
|
+
if(*yytext == '\\')
|
1058
1300
|
{
|
1059
1301
|
if(checkIdentifier(ident->v) == ICE_SCOPED_IDENTIFIER)
|
1060
1302
|
{
|
@@ -1084,18 +1326,18 @@ YY_RULE_SETUP
|
|
1084
1326
|
YY_BREAK
|
1085
1327
|
case 12:
|
1086
1328
|
YY_RULE_SETUP
|
1087
|
-
#line
|
1329
|
+
#line 236 "src/Slice/Scanner.l"
|
1088
1330
|
{
|
1089
1331
|
BEGIN(MAINSCAN);
|
1090
1332
|
StringTokPtr ident = new StringTok;
|
1091
|
-
ident->v = *
|
1333
|
+
ident->v = *yytext == '\\' ? yytext + 1 : yytext;
|
1092
1334
|
*yylvalp = ident;
|
1093
|
-
return *
|
1335
|
+
return *yytext == '\\' ? checkIdentifier(ident->v) : checkKeyword(ident->v);
|
1094
1336
|
}
|
1095
1337
|
YY_BREAK
|
1096
1338
|
case 13:
|
1097
1339
|
YY_RULE_SETUP
|
1098
|
-
#line
|
1340
|
+
#line 244 "src/Slice/Scanner.l"
|
1099
1341
|
{
|
1100
1342
|
BEGIN(MAINSCAN);
|
1101
1343
|
StringTokPtr str = new StringTok;
|
@@ -1303,17 +1545,17 @@ YY_RULE_SETUP
|
|
1303
1545
|
YY_BREAK
|
1304
1546
|
case 14:
|
1305
1547
|
YY_RULE_SETUP
|
1306
|
-
#line
|
1548
|
+
#line 449 "src/Slice/Scanner.l"
|
1307
1549
|
{
|
1308
1550
|
BEGIN(MAINSCAN);
|
1309
1551
|
IntegerTokPtr itp = new IntegerTok;
|
1310
|
-
itp->literal = string(
|
1552
|
+
itp->literal = string(yytext);
|
1311
1553
|
*yylvalp = itp;
|
1312
|
-
if(!IceUtilInternal::stringToInt64(string(
|
1554
|
+
if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
|
1313
1555
|
{
|
1314
1556
|
assert(itp->v != 0);
|
1315
1557
|
string msg = "integer constant `";
|
1316
|
-
msg +=
|
1558
|
+
msg += yytext;
|
1317
1559
|
msg += "' out of range";
|
1318
1560
|
unit->error(msg);
|
1319
1561
|
}
|
@@ -1322,13 +1564,13 @@ YY_RULE_SETUP
|
|
1322
1564
|
YY_BREAK
|
1323
1565
|
case 15:
|
1324
1566
|
YY_RULE_SETUP
|
1325
|
-
#line
|
1567
|
+
#line 465 "src/Slice/Scanner.l"
|
1326
1568
|
{
|
1327
1569
|
BEGIN(MAINSCAN);
|
1328
1570
|
errno = 0;
|
1329
1571
|
FloatingTokPtr ftp = new FloatingTok;
|
1330
1572
|
*yylvalp = ftp;
|
1331
|
-
string literal(
|
1573
|
+
string literal(yytext);
|
1332
1574
|
ftp->literal = literal;
|
1333
1575
|
char lastChar = literal[literal.size() - 1];
|
1334
1576
|
if(lastChar == 'f' || lastChar == 'F')
|
@@ -1339,14 +1581,14 @@ YY_RULE_SETUP
|
|
1339
1581
|
if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
|
1340
1582
|
{
|
1341
1583
|
string msg = "floating-point constant `";
|
1342
|
-
msg +=
|
1584
|
+
msg += yytext;
|
1343
1585
|
msg += "' too large (overflow)";
|
1344
1586
|
unit->error(msg);
|
1345
1587
|
}
|
1346
1588
|
else if(ftp->v == 0 && errno == ERANGE)
|
1347
1589
|
{
|
1348
1590
|
string msg = "floating-point constant `";
|
1349
|
-
msg +=
|
1591
|
+
msg += yytext;
|
1350
1592
|
msg += "' too small (underflow)";
|
1351
1593
|
unit->error(msg);
|
1352
1594
|
}
|
@@ -1356,7 +1598,7 @@ YY_RULE_SETUP
|
|
1356
1598
|
case 16:
|
1357
1599
|
/* rule 16 can match eol */
|
1358
1600
|
YY_RULE_SETUP
|
1359
|
-
#line
|
1601
|
+
#line 495 "src/Slice/Scanner.l"
|
1360
1602
|
{
|
1361
1603
|
// Ignore white-space
|
1362
1604
|
|
@@ -1364,7 +1606,7 @@ YY_RULE_SETUP
|
|
1364
1606
|
{
|
1365
1607
|
BEGIN(MAINSCAN);
|
1366
1608
|
}
|
1367
|
-
if(
|
1609
|
+
if(yytext[0] == '\n')
|
1368
1610
|
{
|
1369
1611
|
unit->nextLine();
|
1370
1612
|
}
|
@@ -1372,7 +1614,7 @@ YY_RULE_SETUP
|
|
1372
1614
|
YY_BREAK
|
1373
1615
|
case 17:
|
1374
1616
|
YY_RULE_SETUP
|
1375
|
-
#line
|
1617
|
+
#line 508 "src/Slice/Scanner.l"
|
1376
1618
|
{
|
1377
1619
|
// Ignore UTF-8 BOM, rule only active when parsing start of file.
|
1378
1620
|
|
@@ -1381,29 +1623,29 @@ YY_RULE_SETUP
|
|
1381
1623
|
YY_BREAK
|
1382
1624
|
case 18:
|
1383
1625
|
YY_RULE_SETUP
|
1384
|
-
#line
|
1626
|
+
#line 514 "src/Slice/Scanner.l"
|
1385
1627
|
{
|
1386
1628
|
BEGIN(MAINSCAN);
|
1387
|
-
if(
|
1629
|
+
if(yytext[0] < 32 || yytext[0] > 126)
|
1388
1630
|
{
|
1389
1631
|
stringstream s;
|
1390
1632
|
s << "illegal input character: '\\";
|
1391
1633
|
s.width(3);
|
1392
1634
|
s.fill('0');
|
1393
|
-
s << oct << static_cast<int>(static_cast<unsigned char>(
|
1635
|
+
s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
|
1394
1636
|
s << "'";
|
1395
1637
|
unit->error(s.str());
|
1396
1638
|
return BAD_CHAR;
|
1397
1639
|
}
|
1398
|
-
return
|
1640
|
+
return yytext[0];
|
1399
1641
|
}
|
1400
1642
|
YY_BREAK
|
1401
1643
|
case 19:
|
1402
1644
|
YY_RULE_SETUP
|
1403
|
-
#line
|
1645
|
+
#line 530 "src/Slice/Scanner.l"
|
1404
1646
|
ECHO;
|
1405
1647
|
YY_BREAK
|
1406
|
-
#line
|
1648
|
+
#line 1647 "src/Slice/Scanner.cpp"
|
1407
1649
|
case YY_STATE_EOF(INITIAL):
|
1408
1650
|
case YY_STATE_EOF(BOMSCAN):
|
1409
1651
|
case YY_STATE_EOF(MAINSCAN):
|
@@ -1422,15 +1664,15 @@ case YY_STATE_EOF(MAINSCAN):
|
|
1422
1664
|
{
|
1423
1665
|
/* We're scanning a new file or input source. It's
|
1424
1666
|
* possible that this happened because the user
|
1425
|
-
* just pointed
|
1426
|
-
*
|
1667
|
+
* just pointed yyin at a new source and called
|
1668
|
+
* yylex(). If so, then we have to assure
|
1427
1669
|
* consistency between YY_CURRENT_BUFFER and our
|
1428
1670
|
* globals. Here is the right place to do so, because
|
1429
1671
|
* this is the first action (other than possibly a
|
1430
1672
|
* back-up) that will match for the new input source.
|
1431
1673
|
*/
|
1432
1674
|
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
|
1433
|
-
YY_CURRENT_BUFFER_LVALUE->yy_input_file =
|
1675
|
+
YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
|
1434
1676
|
YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
|
1435
1677
|
}
|
1436
1678
|
|
@@ -1484,11 +1726,11 @@ case YY_STATE_EOF(MAINSCAN):
|
|
1484
1726
|
{
|
1485
1727
|
(yy_did_buffer_switch_on_eof) = 0;
|
1486
1728
|
|
1487
|
-
if (
|
1729
|
+
if ( yywrap( ) )
|
1488
1730
|
{
|
1489
1731
|
/* Note: because we've taken care in
|
1490
1732
|
* yy_get_next_buffer() to have set up
|
1491
|
-
*
|
1733
|
+
* yytext, we can now set up
|
1492
1734
|
* yy_c_buf_p so that if some total
|
1493
1735
|
* hoser (like flex itself) wants to
|
1494
1736
|
* call the scanner after we return the
|
@@ -1537,7 +1779,8 @@ case YY_STATE_EOF(MAINSCAN):
|
|
1537
1779
|
"fatal flex scanner internal error--no action found" );
|
1538
1780
|
} /* end of action switch */
|
1539
1781
|
} /* end of scanning one token */
|
1540
|
-
} /* end of
|
1782
|
+
} /* end of user's declarations */
|
1783
|
+
} /* end of yylex */
|
1541
1784
|
|
1542
1785
|
/* yy_get_next_buffer - try to read in a new buffer
|
1543
1786
|
*
|
@@ -1548,9 +1791,9 @@ case YY_STATE_EOF(MAINSCAN):
|
|
1548
1791
|
*/
|
1549
1792
|
static int yy_get_next_buffer (void)
|
1550
1793
|
{
|
1551
|
-
|
1552
|
-
|
1553
|
-
|
1794
|
+
char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
|
1795
|
+
char *source = (yytext_ptr);
|
1796
|
+
int number_to_move, i;
|
1554
1797
|
int ret_val;
|
1555
1798
|
|
1556
1799
|
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
|
@@ -1579,7 +1822,7 @@ static int yy_get_next_buffer (void)
|
|
1579
1822
|
/* Try to read more data. */
|
1580
1823
|
|
1581
1824
|
/* First move last chars to start of buffer. */
|
1582
|
-
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)
|
1825
|
+
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
|
1583
1826
|
|
1584
1827
|
for ( i = 0; i < number_to_move; ++i )
|
1585
1828
|
*(dest++) = *(source++);
|
@@ -1592,7 +1835,7 @@ static int yy_get_next_buffer (void)
|
|
1592
1835
|
|
1593
1836
|
else
|
1594
1837
|
{
|
1595
|
-
|
1838
|
+
int num_to_read =
|
1596
1839
|
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
|
1597
1840
|
|
1598
1841
|
while ( num_to_read <= 0 )
|
@@ -1606,7 +1849,7 @@ static int yy_get_next_buffer (void)
|
|
1606
1849
|
|
1607
1850
|
if ( b->yy_is_our_buffer )
|
1608
1851
|
{
|
1609
|
-
|
1852
|
+
int new_size = b->yy_buf_size * 2;
|
1610
1853
|
|
1611
1854
|
if ( new_size <= 0 )
|
1612
1855
|
b->yy_buf_size += b->yy_buf_size / 8;
|
@@ -1615,11 +1858,12 @@ static int yy_get_next_buffer (void)
|
|
1615
1858
|
|
1616
1859
|
b->yy_ch_buf = (char *)
|
1617
1860
|
/* Include room in for 2 EOB chars. */
|
1618
|
-
|
1861
|
+
yyrealloc( (void *) b->yy_ch_buf,
|
1862
|
+
(yy_size_t) (b->yy_buf_size + 2) );
|
1619
1863
|
}
|
1620
1864
|
else
|
1621
1865
|
/* Can't grow it, we don't own it. */
|
1622
|
-
b->yy_ch_buf =
|
1866
|
+
b->yy_ch_buf = NULL;
|
1623
1867
|
|
1624
1868
|
if ( ! b->yy_ch_buf )
|
1625
1869
|
YY_FATAL_ERROR(
|
@@ -1647,7 +1891,7 @@ static int yy_get_next_buffer (void)
|
|
1647
1891
|
if ( number_to_move == YY_MORE_ADJ )
|
1648
1892
|
{
|
1649
1893
|
ret_val = EOB_ACT_END_OF_FILE;
|
1650
|
-
|
1894
|
+
yyrestart( yyin );
|
1651
1895
|
}
|
1652
1896
|
|
1653
1897
|
else
|
@@ -1661,12 +1905,15 @@ static int yy_get_next_buffer (void)
|
|
1661
1905
|
else
|
1662
1906
|
ret_val = EOB_ACT_CONTINUE_SCAN;
|
1663
1907
|
|
1664
|
-
if ((
|
1908
|
+
if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
|
1665
1909
|
/* Extend the array by 50%, plus the number we really need. */
|
1666
|
-
|
1667
|
-
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *)
|
1910
|
+
int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
|
1911
|
+
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
|
1912
|
+
(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
|
1668
1913
|
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
|
1669
1914
|
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
|
1915
|
+
/* "- 2" to take care of EOB's */
|
1916
|
+
YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
|
1670
1917
|
}
|
1671
1918
|
|
1672
1919
|
(yy_n_chars) += number_to_move;
|
@@ -1682,15 +1929,15 @@ static int yy_get_next_buffer (void)
|
|
1682
1929
|
|
1683
1930
|
static yy_state_type yy_get_previous_state (void)
|
1684
1931
|
{
|
1685
|
-
|
1686
|
-
|
1932
|
+
yy_state_type yy_current_state;
|
1933
|
+
char *yy_cp;
|
1687
1934
|
|
1688
1935
|
yy_current_state = (yy_start);
|
1689
1936
|
yy_current_state += YY_AT_BOL();
|
1690
1937
|
|
1691
1938
|
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
|
1692
1939
|
{
|
1693
|
-
|
1940
|
+
YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
|
1694
1941
|
if ( yy_accept[yy_current_state] )
|
1695
1942
|
{
|
1696
1943
|
(yy_last_accepting_state) = yy_current_state;
|
@@ -1700,9 +1947,9 @@ static int yy_get_next_buffer (void)
|
|
1700
1947
|
{
|
1701
1948
|
yy_current_state = (int) yy_def[yy_current_state];
|
1702
1949
|
if ( yy_current_state >= 76 )
|
1703
|
-
yy_c = yy_meta[
|
1950
|
+
yy_c = yy_meta[yy_c];
|
1704
1951
|
}
|
1705
|
-
yy_current_state = yy_nxt[yy_base[yy_current_state] +
|
1952
|
+
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
1706
1953
|
}
|
1707
1954
|
|
1708
1955
|
return yy_current_state;
|
@@ -1715,10 +1962,10 @@ static int yy_get_next_buffer (void)
|
|
1715
1962
|
*/
|
1716
1963
|
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
|
1717
1964
|
{
|
1718
|
-
|
1719
|
-
|
1965
|
+
int yy_is_jam;
|
1966
|
+
char *yy_cp = (yy_c_buf_p);
|
1720
1967
|
|
1721
|
-
|
1968
|
+
YY_CHAR yy_c = 1;
|
1722
1969
|
if ( yy_accept[yy_current_state] )
|
1723
1970
|
{
|
1724
1971
|
(yy_last_accepting_state) = yy_current_state;
|
@@ -1728,30 +1975,32 @@ static int yy_get_next_buffer (void)
|
|
1728
1975
|
{
|
1729
1976
|
yy_current_state = (int) yy_def[yy_current_state];
|
1730
1977
|
if ( yy_current_state >= 76 )
|
1731
|
-
yy_c = yy_meta[
|
1978
|
+
yy_c = yy_meta[yy_c];
|
1732
1979
|
}
|
1733
|
-
yy_current_state = yy_nxt[yy_base[yy_current_state] +
|
1980
|
+
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
|
1734
1981
|
yy_is_jam = (yy_current_state == 75);
|
1735
1982
|
|
1736
1983
|
return yy_is_jam ? 0 : yy_current_state;
|
1737
1984
|
}
|
1738
1985
|
|
1739
|
-
|
1986
|
+
#ifndef YY_NO_UNPUT
|
1987
|
+
|
1988
|
+
static void yyunput (int c, char * yy_bp )
|
1740
1989
|
{
|
1741
|
-
|
1990
|
+
char *yy_cp;
|
1742
1991
|
|
1743
1992
|
yy_cp = (yy_c_buf_p);
|
1744
1993
|
|
1745
|
-
/* undo effects of setting up
|
1994
|
+
/* undo effects of setting up yytext */
|
1746
1995
|
*yy_cp = (yy_hold_char);
|
1747
1996
|
|
1748
1997
|
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
|
1749
1998
|
{ /* need to shift things up to make room */
|
1750
1999
|
/* +2 for EOB chars. */
|
1751
|
-
|
1752
|
-
|
2000
|
+
int number_to_move = (yy_n_chars) + 2;
|
2001
|
+
char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
|
1753
2002
|
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
|
1754
|
-
|
2003
|
+
char *source =
|
1755
2004
|
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
|
1756
2005
|
|
1757
2006
|
while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
|
@@ -1760,7 +2009,7 @@ static int yy_get_next_buffer (void)
|
|
1760
2009
|
yy_cp += (int) (dest - source);
|
1761
2010
|
yy_bp += (int) (dest - source);
|
1762
2011
|
YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
|
1763
|
-
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
|
2012
|
+
(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
|
1764
2013
|
|
1765
2014
|
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
|
1766
2015
|
YY_FATAL_ERROR( "flex scanner push-back overflow" );
|
@@ -1773,6 +2022,8 @@ static int yy_get_next_buffer (void)
|
|
1773
2022
|
(yy_c_buf_p) = yy_cp;
|
1774
2023
|
}
|
1775
2024
|
|
2025
|
+
#endif
|
2026
|
+
|
1776
2027
|
#ifndef YY_NO_INPUT
|
1777
2028
|
#ifdef __cplusplus
|
1778
2029
|
static int yyinput (void)
|
@@ -1797,7 +2048,7 @@ static int yy_get_next_buffer (void)
|
|
1797
2048
|
|
1798
2049
|
else
|
1799
2050
|
{ /* need more input */
|
1800
|
-
|
2051
|
+
int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
|
1801
2052
|
++(yy_c_buf_p);
|
1802
2053
|
|
1803
2054
|
switch ( yy_get_next_buffer( ) )
|
@@ -1814,14 +2065,14 @@ static int yy_get_next_buffer (void)
|
|
1814
2065
|
*/
|
1815
2066
|
|
1816
2067
|
/* Reset buffer status. */
|
1817
|
-
|
2068
|
+
yyrestart( yyin );
|
1818
2069
|
|
1819
2070
|
/*FALLTHROUGH*/
|
1820
2071
|
|
1821
2072
|
case EOB_ACT_END_OF_FILE:
|
1822
2073
|
{
|
1823
|
-
if (
|
1824
|
-
return
|
2074
|
+
if ( yywrap( ) )
|
2075
|
+
return 0;
|
1825
2076
|
|
1826
2077
|
if ( ! (yy_did_buffer_switch_on_eof) )
|
1827
2078
|
YY_NEW_FILE;
|
@@ -1840,7 +2091,7 @@ static int yy_get_next_buffer (void)
|
|
1840
2091
|
}
|
1841
2092
|
|
1842
2093
|
c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
|
1843
|
-
*(yy_c_buf_p) = '\0'; /* preserve
|
2094
|
+
*(yy_c_buf_p) = '\0'; /* preserve yytext */
|
1844
2095
|
(yy_hold_char) = *++(yy_c_buf_p);
|
1845
2096
|
|
1846
2097
|
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
|
@@ -1854,32 +2105,32 @@ static int yy_get_next_buffer (void)
|
|
1854
2105
|
*
|
1855
2106
|
* @note This function does not reset the start condition to @c INITIAL .
|
1856
2107
|
*/
|
1857
|
-
void
|
2108
|
+
void yyrestart (FILE * input_file )
|
1858
2109
|
{
|
1859
2110
|
|
1860
2111
|
if ( ! YY_CURRENT_BUFFER ){
|
1861
|
-
|
2112
|
+
yyensure_buffer_stack ();
|
1862
2113
|
YY_CURRENT_BUFFER_LVALUE =
|
1863
|
-
|
2114
|
+
yy_create_buffer( yyin, YY_BUF_SIZE );
|
1864
2115
|
}
|
1865
2116
|
|
1866
|
-
|
1867
|
-
|
2117
|
+
yy_init_buffer( YY_CURRENT_BUFFER, input_file );
|
2118
|
+
yy_load_buffer_state( );
|
1868
2119
|
}
|
1869
2120
|
|
1870
2121
|
/** Switch to a different input buffer.
|
1871
2122
|
* @param new_buffer The new input buffer.
|
1872
2123
|
*
|
1873
2124
|
*/
|
1874
|
-
void
|
2125
|
+
void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
|
1875
2126
|
{
|
1876
2127
|
|
1877
2128
|
/* TODO. We should be able to replace this entire function body
|
1878
2129
|
* with
|
1879
|
-
*
|
1880
|
-
*
|
2130
|
+
* yypop_buffer_state();
|
2131
|
+
* yypush_buffer_state(new_buffer);
|
1881
2132
|
*/
|
1882
|
-
|
2133
|
+
yyensure_buffer_stack ();
|
1883
2134
|
if ( YY_CURRENT_BUFFER == new_buffer )
|
1884
2135
|
return;
|
1885
2136
|
|
@@ -1892,21 +2143,21 @@ static int yy_get_next_buffer (void)
|
|
1892
2143
|
}
|
1893
2144
|
|
1894
2145
|
YY_CURRENT_BUFFER_LVALUE = new_buffer;
|
1895
|
-
|
2146
|
+
yy_load_buffer_state( );
|
1896
2147
|
|
1897
2148
|
/* We don't actually know whether we did this switch during
|
1898
|
-
* EOF (
|
1899
|
-
* is looked at is after
|
2149
|
+
* EOF (yywrap()) processing, but the only time this flag
|
2150
|
+
* is looked at is after yywrap() is called, so it's safe
|
1900
2151
|
* to go ahead and always set it.
|
1901
2152
|
*/
|
1902
2153
|
(yy_did_buffer_switch_on_eof) = 1;
|
1903
2154
|
}
|
1904
2155
|
|
1905
|
-
static void
|
2156
|
+
static void yy_load_buffer_state (void)
|
1906
2157
|
{
|
1907
2158
|
(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
|
1908
2159
|
(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
|
1909
|
-
|
2160
|
+
yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
|
1910
2161
|
(yy_hold_char) = *(yy_c_buf_p);
|
1911
2162
|
}
|
1912
2163
|
|
@@ -1916,35 +2167,35 @@ static void slice__load_buffer_state (void)
|
|
1916
2167
|
*
|
1917
2168
|
* @return the allocated buffer state.
|
1918
2169
|
*/
|
1919
|
-
YY_BUFFER_STATE
|
2170
|
+
YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
|
1920
2171
|
{
|
1921
2172
|
YY_BUFFER_STATE b;
|
1922
2173
|
|
1923
|
-
b = (YY_BUFFER_STATE)
|
2174
|
+
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
|
1924
2175
|
if ( ! b )
|
1925
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2176
|
+
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
|
1926
2177
|
|
1927
2178
|
b->yy_buf_size = size;
|
1928
2179
|
|
1929
2180
|
/* yy_ch_buf has to be 2 characters longer than the size given because
|
1930
2181
|
* we need to put in 2 end-of-buffer characters.
|
1931
2182
|
*/
|
1932
|
-
b->yy_ch_buf = (char *)
|
2183
|
+
b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) );
|
1933
2184
|
if ( ! b->yy_ch_buf )
|
1934
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2185
|
+
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
|
1935
2186
|
|
1936
2187
|
b->yy_is_our_buffer = 1;
|
1937
2188
|
|
1938
|
-
|
2189
|
+
yy_init_buffer( b, file );
|
1939
2190
|
|
1940
2191
|
return b;
|
1941
2192
|
}
|
1942
2193
|
|
1943
2194
|
/** Destroy the buffer.
|
1944
|
-
* @param b a buffer created with
|
2195
|
+
* @param b a buffer created with yy_create_buffer()
|
1945
2196
|
*
|
1946
2197
|
*/
|
1947
|
-
void
|
2198
|
+
void yy_delete_buffer (YY_BUFFER_STATE b )
|
1948
2199
|
{
|
1949
2200
|
|
1950
2201
|
if ( ! b )
|
@@ -1954,27 +2205,27 @@ static void slice__load_buffer_state (void)
|
|
1954
2205
|
YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
|
1955
2206
|
|
1956
2207
|
if ( b->yy_is_our_buffer )
|
1957
|
-
|
2208
|
+
yyfree( (void *) b->yy_ch_buf );
|
1958
2209
|
|
1959
|
-
|
2210
|
+
yyfree( (void *) b );
|
1960
2211
|
}
|
1961
2212
|
|
1962
2213
|
/* Initializes or reinitializes a buffer.
|
1963
2214
|
* This function is sometimes called more than once on the same buffer,
|
1964
|
-
* such as during a
|
2215
|
+
* such as during a yyrestart() or at EOF.
|
1965
2216
|
*/
|
1966
|
-
static void
|
2217
|
+
static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
|
1967
2218
|
|
1968
2219
|
{
|
1969
2220
|
int oerrno = errno;
|
1970
2221
|
|
1971
|
-
|
2222
|
+
yy_flush_buffer( b );
|
1972
2223
|
|
1973
2224
|
b->yy_input_file = file;
|
1974
2225
|
b->yy_fill_buffer = 1;
|
1975
2226
|
|
1976
|
-
/* If b is the current buffer, then
|
1977
|
-
* called from
|
2227
|
+
/* If b is the current buffer, then yy_init_buffer was _probably_
|
2228
|
+
* called from yyrestart() or through yy_get_next_buffer.
|
1978
2229
|
* In that case, we don't want to reset the lineno or column.
|
1979
2230
|
*/
|
1980
2231
|
if (b != YY_CURRENT_BUFFER){
|
@@ -1991,7 +2242,7 @@ static void slice__load_buffer_state (void)
|
|
1991
2242
|
* @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
|
1992
2243
|
*
|
1993
2244
|
*/
|
1994
|
-
void
|
2245
|
+
void yy_flush_buffer (YY_BUFFER_STATE b )
|
1995
2246
|
{
|
1996
2247
|
if ( ! b )
|
1997
2248
|
return;
|
@@ -2011,7 +2262,7 @@ static void slice__load_buffer_state (void)
|
|
2011
2262
|
b->yy_buffer_status = YY_BUFFER_NEW;
|
2012
2263
|
|
2013
2264
|
if ( b == YY_CURRENT_BUFFER )
|
2014
|
-
|
2265
|
+
yy_load_buffer_state( );
|
2015
2266
|
}
|
2016
2267
|
|
2017
2268
|
/** Pushes the new state onto the stack. The new state becomes
|
@@ -2020,14 +2271,14 @@ static void slice__load_buffer_state (void)
|
|
2020
2271
|
* @param new_buffer The new state.
|
2021
2272
|
*
|
2022
2273
|
*/
|
2023
|
-
void
|
2274
|
+
void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
|
2024
2275
|
{
|
2025
2276
|
if (new_buffer == NULL)
|
2026
2277
|
return;
|
2027
2278
|
|
2028
|
-
|
2279
|
+
yyensure_buffer_stack();
|
2029
2280
|
|
2030
|
-
/* This block is copied from
|
2281
|
+
/* This block is copied from yy_switch_to_buffer. */
|
2031
2282
|
if ( YY_CURRENT_BUFFER )
|
2032
2283
|
{
|
2033
2284
|
/* Flush out information for old buffer. */
|
@@ -2041,8 +2292,8 @@ void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
|
2041
2292
|
(yy_buffer_stack_top)++;
|
2042
2293
|
YY_CURRENT_BUFFER_LVALUE = new_buffer;
|
2043
2294
|
|
2044
|
-
/* copied from
|
2045
|
-
|
2295
|
+
/* copied from yy_switch_to_buffer. */
|
2296
|
+
yy_load_buffer_state( );
|
2046
2297
|
(yy_did_buffer_switch_on_eof) = 1;
|
2047
2298
|
}
|
2048
2299
|
|
@@ -2050,18 +2301,18 @@ void slice_push_buffer_state (YY_BUFFER_STATE new_buffer )
|
|
2050
2301
|
* The next element becomes the new top.
|
2051
2302
|
*
|
2052
2303
|
*/
|
2053
|
-
void
|
2304
|
+
void yypop_buffer_state (void)
|
2054
2305
|
{
|
2055
2306
|
if (!YY_CURRENT_BUFFER)
|
2056
2307
|
return;
|
2057
2308
|
|
2058
|
-
|
2309
|
+
yy_delete_buffer(YY_CURRENT_BUFFER );
|
2059
2310
|
YY_CURRENT_BUFFER_LVALUE = NULL;
|
2060
2311
|
if ((yy_buffer_stack_top) > 0)
|
2061
2312
|
--(yy_buffer_stack_top);
|
2062
2313
|
|
2063
2314
|
if (YY_CURRENT_BUFFER) {
|
2064
|
-
|
2315
|
+
yy_load_buffer_state( );
|
2065
2316
|
(yy_did_buffer_switch_on_eof) = 1;
|
2066
2317
|
}
|
2067
2318
|
}
|
@@ -2069,7 +2320,7 @@ void slice_pop_buffer_state (void)
|
|
2069
2320
|
/* Allocates the stack if it does not exist.
|
2070
2321
|
* Guarantees space for at least one push.
|
2071
2322
|
*/
|
2072
|
-
static void
|
2323
|
+
static void yyensure_buffer_stack (void)
|
2073
2324
|
{
|
2074
2325
|
yy_size_t num_to_alloc;
|
2075
2326
|
|
@@ -2079,15 +2330,15 @@ static void slice_ensure_buffer_stack (void)
|
|
2079
2330
|
* scanner will even need a stack. We use 2 instead of 1 to avoid an
|
2080
2331
|
* immediate realloc on the next call.
|
2081
2332
|
*/
|
2082
|
-
|
2083
|
-
(yy_buffer_stack) = (struct yy_buffer_state**)
|
2333
|
+
num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
|
2334
|
+
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
|
2084
2335
|
(num_to_alloc * sizeof(struct yy_buffer_state*)
|
2085
2336
|
);
|
2086
2337
|
if ( ! (yy_buffer_stack) )
|
2087
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2088
|
-
|
2338
|
+
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
|
2339
|
+
|
2089
2340
|
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
|
2090
|
-
|
2341
|
+
|
2091
2342
|
(yy_buffer_stack_max) = num_to_alloc;
|
2092
2343
|
(yy_buffer_stack_top) = 0;
|
2093
2344
|
return;
|
@@ -2096,15 +2347,15 @@ static void slice_ensure_buffer_stack (void)
|
|
2096
2347
|
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
|
2097
2348
|
|
2098
2349
|
/* Increase the buffer to prepare for a possible push. */
|
2099
|
-
|
2350
|
+
yy_size_t grow_size = 8 /* arbitrary grow size */;
|
2100
2351
|
|
2101
2352
|
num_to_alloc = (yy_buffer_stack_max) + grow_size;
|
2102
|
-
(yy_buffer_stack) = (struct yy_buffer_state**)
|
2353
|
+
(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
|
2103
2354
|
((yy_buffer_stack),
|
2104
2355
|
num_to_alloc * sizeof(struct yy_buffer_state*)
|
2105
2356
|
);
|
2106
2357
|
if ( ! (yy_buffer_stack) )
|
2107
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2358
|
+
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
|
2108
2359
|
|
2109
2360
|
/* zero only the new slots.*/
|
2110
2361
|
memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
|
@@ -2116,9 +2367,9 @@ static void slice_ensure_buffer_stack (void)
|
|
2116
2367
|
* @param base the character buffer
|
2117
2368
|
* @param size the size in bytes of the character buffer
|
2118
2369
|
*
|
2119
|
-
* @return the newly allocated buffer state object.
|
2370
|
+
* @return the newly allocated buffer state object.
|
2120
2371
|
*/
|
2121
|
-
YY_BUFFER_STATE
|
2372
|
+
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
|
2122
2373
|
{
|
2123
2374
|
YY_BUFFER_STATE b;
|
2124
2375
|
|
@@ -2126,49 +2377,49 @@ YY_BUFFER_STATE slice__scan_buffer (char * base, yy_size_t size )
|
|
2126
2377
|
base[size-2] != YY_END_OF_BUFFER_CHAR ||
|
2127
2378
|
base[size-1] != YY_END_OF_BUFFER_CHAR )
|
2128
2379
|
/* They forgot to leave room for the EOB's. */
|
2129
|
-
return
|
2380
|
+
return NULL;
|
2130
2381
|
|
2131
|
-
b = (YY_BUFFER_STATE)
|
2382
|
+
b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
|
2132
2383
|
if ( ! b )
|
2133
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2384
|
+
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
|
2134
2385
|
|
2135
|
-
b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
|
2386
|
+
b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
|
2136
2387
|
b->yy_buf_pos = b->yy_ch_buf = base;
|
2137
2388
|
b->yy_is_our_buffer = 0;
|
2138
|
-
b->yy_input_file =
|
2389
|
+
b->yy_input_file = NULL;
|
2139
2390
|
b->yy_n_chars = b->yy_buf_size;
|
2140
2391
|
b->yy_is_interactive = 0;
|
2141
2392
|
b->yy_at_bol = 1;
|
2142
2393
|
b->yy_fill_buffer = 0;
|
2143
2394
|
b->yy_buffer_status = YY_BUFFER_NEW;
|
2144
2395
|
|
2145
|
-
|
2396
|
+
yy_switch_to_buffer( b );
|
2146
2397
|
|
2147
2398
|
return b;
|
2148
2399
|
}
|
2149
2400
|
|
2150
|
-
/** Setup the input buffer state to scan a string. The next call to
|
2401
|
+
/** Setup the input buffer state to scan a string. The next call to yylex() will
|
2151
2402
|
* scan from a @e copy of @a str.
|
2152
2403
|
* @param yystr a NUL-terminated string to scan
|
2153
2404
|
*
|
2154
2405
|
* @return the newly allocated buffer state object.
|
2155
2406
|
* @note If you want to scan bytes that may contain NUL values, then use
|
2156
|
-
*
|
2407
|
+
* yy_scan_bytes() instead.
|
2157
2408
|
*/
|
2158
|
-
YY_BUFFER_STATE
|
2409
|
+
YY_BUFFER_STATE yy_scan_string (const char * yystr )
|
2159
2410
|
{
|
2160
2411
|
|
2161
|
-
return
|
2412
|
+
return yy_scan_bytes( yystr, (int) strlen(yystr) );
|
2162
2413
|
}
|
2163
2414
|
|
2164
|
-
/** Setup the input buffer state to scan the given bytes. The next call to
|
2415
|
+
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
|
2165
2416
|
* scan from a @e copy of @a bytes.
|
2166
2417
|
* @param yybytes the byte buffer to scan
|
2167
2418
|
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
|
2168
2419
|
*
|
2169
2420
|
* @return the newly allocated buffer state object.
|
2170
2421
|
*/
|
2171
|
-
YY_BUFFER_STATE
|
2422
|
+
YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len )
|
2172
2423
|
{
|
2173
2424
|
YY_BUFFER_STATE b;
|
2174
2425
|
char *buf;
|
@@ -2176,19 +2427,19 @@ YY_BUFFER_STATE slice__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_
|
|
2176
2427
|
int i;
|
2177
2428
|
|
2178
2429
|
/* Get memory for full buffer, including space for trailing EOB's. */
|
2179
|
-
n = _yybytes_len + 2;
|
2180
|
-
buf = (char *)
|
2430
|
+
n = (yy_size_t) (_yybytes_len + 2);
|
2431
|
+
buf = (char *) yyalloc( n );
|
2181
2432
|
if ( ! buf )
|
2182
|
-
YY_FATAL_ERROR( "out of dynamic memory in
|
2433
|
+
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
|
2183
2434
|
|
2184
2435
|
for ( i = 0; i < _yybytes_len; ++i )
|
2185
2436
|
buf[i] = yybytes[i];
|
2186
2437
|
|
2187
2438
|
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
|
2188
2439
|
|
2189
|
-
b =
|
2440
|
+
b = yy_scan_buffer( buf, n );
|
2190
2441
|
if ( ! b )
|
2191
|
-
YY_FATAL_ERROR( "bad buffer in
|
2442
|
+
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
|
2192
2443
|
|
2193
2444
|
/* It's okay to grow etc. this buffer, and we should throw it
|
2194
2445
|
* away when we're done.
|
@@ -2202,9 +2453,9 @@ YY_BUFFER_STATE slice__scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_
|
|
2202
2453
|
#define YY_EXIT_FAILURE 2
|
2203
2454
|
#endif
|
2204
2455
|
|
2205
|
-
static void yy_fatal_error (
|
2456
|
+
static void yynoreturn yy_fatal_error (const char* msg )
|
2206
2457
|
{
|
2207
|
-
|
2458
|
+
fprintf( stderr, "%s\n", msg );
|
2208
2459
|
exit( YY_EXIT_FAILURE );
|
2209
2460
|
}
|
2210
2461
|
|
@@ -2214,14 +2465,14 @@ static void yy_fatal_error (yyconst char* msg )
|
|
2214
2465
|
#define yyless(n) \
|
2215
2466
|
do \
|
2216
2467
|
{ \
|
2217
|
-
/* Undo effects of setting up
|
2468
|
+
/* Undo effects of setting up yytext. */ \
|
2218
2469
|
int yyless_macro_arg = (n); \
|
2219
2470
|
YY_LESS_LINENO(yyless_macro_arg);\
|
2220
|
-
|
2221
|
-
(yy_c_buf_p) =
|
2471
|
+
yytext[yyleng] = (yy_hold_char); \
|
2472
|
+
(yy_c_buf_p) = yytext + yyless_macro_arg; \
|
2222
2473
|
(yy_hold_char) = *(yy_c_buf_p); \
|
2223
2474
|
*(yy_c_buf_p) = '\0'; \
|
2224
|
-
|
2475
|
+
yyleng = yyless_macro_arg; \
|
2225
2476
|
} \
|
2226
2477
|
while ( 0 )
|
2227
2478
|
|
@@ -2230,126 +2481,126 @@ static void yy_fatal_error (yyconst char* msg )
|
|
2230
2481
|
/** Get the current line number.
|
2231
2482
|
*
|
2232
2483
|
*/
|
2233
|
-
int
|
2484
|
+
int yyget_lineno (void)
|
2234
2485
|
{
|
2235
|
-
|
2236
|
-
return
|
2486
|
+
|
2487
|
+
return yylineno;
|
2237
2488
|
}
|
2238
2489
|
|
2239
2490
|
/** Get the input stream.
|
2240
2491
|
*
|
2241
2492
|
*/
|
2242
|
-
FILE *
|
2493
|
+
FILE *yyget_in (void)
|
2243
2494
|
{
|
2244
|
-
return
|
2495
|
+
return yyin;
|
2245
2496
|
}
|
2246
2497
|
|
2247
2498
|
/** Get the output stream.
|
2248
2499
|
*
|
2249
2500
|
*/
|
2250
|
-
FILE *
|
2501
|
+
FILE *yyget_out (void)
|
2251
2502
|
{
|
2252
|
-
return
|
2503
|
+
return yyout;
|
2253
2504
|
}
|
2254
2505
|
|
2255
2506
|
/** Get the length of the current token.
|
2256
2507
|
*
|
2257
2508
|
*/
|
2258
|
-
|
2509
|
+
int yyget_leng (void)
|
2259
2510
|
{
|
2260
|
-
return
|
2511
|
+
return yyleng;
|
2261
2512
|
}
|
2262
2513
|
|
2263
2514
|
/** Get the current token.
|
2264
2515
|
*
|
2265
2516
|
*/
|
2266
2517
|
|
2267
|
-
char *
|
2518
|
+
char *yyget_text (void)
|
2268
2519
|
{
|
2269
|
-
return
|
2520
|
+
return yytext;
|
2270
2521
|
}
|
2271
2522
|
|
2272
2523
|
/** Set the current line number.
|
2273
|
-
* @param
|
2524
|
+
* @param _line_number line number
|
2274
2525
|
*
|
2275
2526
|
*/
|
2276
|
-
void
|
2527
|
+
void yyset_lineno (int _line_number )
|
2277
2528
|
{
|
2278
2529
|
|
2279
|
-
|
2530
|
+
yylineno = _line_number;
|
2280
2531
|
}
|
2281
2532
|
|
2282
2533
|
/** Set the input stream. This does not discard the current
|
2283
2534
|
* input buffer.
|
2284
|
-
* @param
|
2535
|
+
* @param _in_str A readable stream.
|
2285
2536
|
*
|
2286
|
-
* @see
|
2537
|
+
* @see yy_switch_to_buffer
|
2287
2538
|
*/
|
2288
|
-
void
|
2539
|
+
void yyset_in (FILE * _in_str )
|
2289
2540
|
{
|
2290
|
-
|
2541
|
+
yyin = _in_str ;
|
2291
2542
|
}
|
2292
2543
|
|
2293
|
-
void
|
2544
|
+
void yyset_out (FILE * _out_str )
|
2294
2545
|
{
|
2295
|
-
|
2546
|
+
yyout = _out_str ;
|
2296
2547
|
}
|
2297
2548
|
|
2298
|
-
int
|
2549
|
+
int yyget_debug (void)
|
2299
2550
|
{
|
2300
|
-
return
|
2551
|
+
return yy_flex_debug;
|
2301
2552
|
}
|
2302
2553
|
|
2303
|
-
void
|
2554
|
+
void yyset_debug (int _bdebug )
|
2304
2555
|
{
|
2305
|
-
|
2556
|
+
yy_flex_debug = _bdebug ;
|
2306
2557
|
}
|
2307
2558
|
|
2308
2559
|
static int yy_init_globals (void)
|
2309
2560
|
{
|
2310
2561
|
/* Initialization is the same as for the non-reentrant scanner.
|
2311
|
-
* This function is called from
|
2562
|
+
* This function is called from yylex_destroy(), so don't allocate here.
|
2312
2563
|
*/
|
2313
2564
|
|
2314
|
-
(yy_buffer_stack) =
|
2565
|
+
(yy_buffer_stack) = NULL;
|
2315
2566
|
(yy_buffer_stack_top) = 0;
|
2316
2567
|
(yy_buffer_stack_max) = 0;
|
2317
|
-
(yy_c_buf_p) =
|
2568
|
+
(yy_c_buf_p) = NULL;
|
2318
2569
|
(yy_init) = 0;
|
2319
2570
|
(yy_start) = 0;
|
2320
2571
|
|
2321
2572
|
/* Defined in main.c */
|
2322
2573
|
#ifdef YY_STDINIT
|
2323
|
-
|
2324
|
-
|
2574
|
+
yyin = stdin;
|
2575
|
+
yyout = stdout;
|
2325
2576
|
#else
|
2326
|
-
|
2327
|
-
|
2577
|
+
yyin = NULL;
|
2578
|
+
yyout = NULL;
|
2328
2579
|
#endif
|
2329
2580
|
|
2330
2581
|
/* For future reference: Set errno on error, since we are called by
|
2331
|
-
*
|
2582
|
+
* yylex_init()
|
2332
2583
|
*/
|
2333
2584
|
return 0;
|
2334
2585
|
}
|
2335
2586
|
|
2336
|
-
/*
|
2337
|
-
int
|
2587
|
+
/* yylex_destroy is for both reentrant and non-reentrant scanners. */
|
2588
|
+
int yylex_destroy (void)
|
2338
2589
|
{
|
2339
2590
|
|
2340
2591
|
/* Pop the buffer stack, destroying each element. */
|
2341
2592
|
while(YY_CURRENT_BUFFER){
|
2342
|
-
|
2593
|
+
yy_delete_buffer( YY_CURRENT_BUFFER );
|
2343
2594
|
YY_CURRENT_BUFFER_LVALUE = NULL;
|
2344
|
-
|
2595
|
+
yypop_buffer_state();
|
2345
2596
|
}
|
2346
2597
|
|
2347
2598
|
/* Destroy the stack itself. */
|
2348
|
-
|
2599
|
+
yyfree((yy_buffer_stack) );
|
2349
2600
|
(yy_buffer_stack) = NULL;
|
2350
2601
|
|
2351
2602
|
/* Reset the globals. This is important in a non-reentrant scanner so the next time
|
2352
|
-
*
|
2603
|
+
* yylex() is called, initialization will occur. */
|
2353
2604
|
yy_init_globals( );
|
2354
2605
|
|
2355
2606
|
return 0;
|
@@ -2360,18 +2611,19 @@ int slice_lex_destroy (void)
|
|
2360
2611
|
*/
|
2361
2612
|
|
2362
2613
|
#ifndef yytext_ptr
|
2363
|
-
static void yy_flex_strncpy (char* s1,
|
2614
|
+
static void yy_flex_strncpy (char* s1, const char * s2, int n )
|
2364
2615
|
{
|
2365
|
-
|
2616
|
+
|
2617
|
+
int i;
|
2366
2618
|
for ( i = 0; i < n; ++i )
|
2367
2619
|
s1[i] = s2[i];
|
2368
2620
|
}
|
2369
2621
|
#endif
|
2370
2622
|
|
2371
2623
|
#ifdef YY_NEED_STRLEN
|
2372
|
-
static int yy_flex_strlen (
|
2624
|
+
static int yy_flex_strlen (const char * s )
|
2373
2625
|
{
|
2374
|
-
|
2626
|
+
int n;
|
2375
2627
|
for ( n = 0; s[n]; ++n )
|
2376
2628
|
;
|
2377
2629
|
|
@@ -2379,13 +2631,14 @@ static int yy_flex_strlen (yyconst char * s )
|
|
2379
2631
|
}
|
2380
2632
|
#endif
|
2381
2633
|
|
2382
|
-
void *
|
2634
|
+
void *yyalloc (yy_size_t size )
|
2383
2635
|
{
|
2384
|
-
|
2636
|
+
return malloc(size);
|
2385
2637
|
}
|
2386
2638
|
|
2387
|
-
void *
|
2639
|
+
void *yyrealloc (void * ptr, yy_size_t size )
|
2388
2640
|
{
|
2641
|
+
|
2389
2642
|
/* The cast to (char *) in the following accommodates both
|
2390
2643
|
* implementations that use char* generic pointers, and those
|
2391
2644
|
* that use void* generic pointers. It works with the latter
|
@@ -2393,18 +2646,17 @@ void *slice_realloc (void * ptr, yy_size_t size )
|
|
2393
2646
|
* any pointer type to void*, and deal with argument conversions
|
2394
2647
|
* as though doing an assignment.
|
2395
2648
|
*/
|
2396
|
-
return
|
2649
|
+
return realloc(ptr, size);
|
2397
2650
|
}
|
2398
2651
|
|
2399
|
-
void
|
2652
|
+
void yyfree (void * ptr )
|
2400
2653
|
{
|
2401
|
-
|
2654
|
+
free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
|
2402
2655
|
}
|
2403
2656
|
|
2404
2657
|
#define YYTABLES_NAME "yytables"
|
2405
2658
|
|
2406
|
-
#line
|
2407
|
-
|
2659
|
+
#line 530 "src/Slice/Scanner.l"
|
2408
2660
|
|
2409
2661
|
|
2410
2662
|
namespace Slice {
|