summaryrefslogtreecommitdiff
path: root/cpp/include/Slice
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/Slice')
-rw-r--r--cpp/include/Slice/CPlusPlusUtil.h2
-rw-r--r--cpp/include/Slice/Checksum.h2
-rw-r--r--cpp/include/Slice/CsUtil.h2
-rw-r--r--cpp/include/Slice/DotNetNames.h2
-rw-r--r--cpp/include/Slice/FileTracker.h2
-rw-r--r--cpp/include/Slice/JavaUtil.h2
-rw-r--r--cpp/include/Slice/Makefile2
-rw-r--r--cpp/include/Slice/Makefile.mak2
-rw-r--r--cpp/include/Slice/PHPUtil.h2
-rw-r--r--cpp/include/Slice/Parser.h7
-rw-r--r--cpp/include/Slice/Preprocessor.h4
-rw-r--r--cpp/include/Slice/PythonUtil.h2
-rw-r--r--cpp/include/Slice/RubyUtil.h2
-rw-r--r--cpp/include/Slice/Util.h2
14 files changed, 20 insertions, 15 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index a6bcae37258..aa373da5b74 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h
index 26ddd63180c..c0c8b219140 100644
--- a/cpp/include/Slice/Checksum.h
+++ b/cpp/include/Slice/Checksum.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h
index a581a8c5c17..e1318358c87 100644
--- a/cpp/include/Slice/CsUtil.h
+++ b/cpp/include/Slice/CsUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h
index 656a73fa4cb..33c7271506f 100644
--- a/cpp/include/Slice/DotNetNames.h
+++ b/cpp/include/Slice/DotNetNames.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h
index d629dfcd4b2..319f2512718 100644
--- a/cpp/include/Slice/FileTracker.h
+++ b/cpp/include/Slice/FileTracker.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h
index 1f95fdad2d8..48a2b8c7b45 100644
--- a/cpp/include/Slice/JavaUtil.h
+++ b/cpp/include/Slice/JavaUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/Makefile b/cpp/include/Slice/Makefile
index 0b862a012f9..583fdd49054 100644
--- a/cpp/include/Slice/Makefile
+++ b/cpp/include/Slice/Makefile
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/Makefile.mak b/cpp/include/Slice/Makefile.mak
index 4cf49ecfb8f..1fceb768c8e 100644
--- a/cpp/include/Slice/Makefile.mak
+++ b/cpp/include/Slice/Makefile.mak
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h
index 55e0dcd31f9..ae9def94920 100644
--- a/cpp/include/Slice/PHPUtil.h
+++ b/cpp/include/Slice/PHPUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 1faf592ed21..a057c12a2d5 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
@@ -458,6 +458,7 @@ public:
bool hasOnlyDictionaries(DictionaryList&) const;
bool hasClassDecls() const;
bool hasClassDefs() const;
+ bool hasOnlyClassDecls() const;
bool hasAbstractClassDefs() const;
bool hasNonLocalDataOnlyClasses() const;
bool hasOtherConstructedOrExceptions() const; // Exceptions or constructed types other than classes.
@@ -1062,6 +1063,9 @@ public:
virtual void visit(ParserVisitor*, bool);
BuiltinPtr builtin(Builtin::Kind); // Not const, as builtins are created on the fly. (Lazy initialization.)
+
+ void addTopLevelModule(const std::string&, const std::string&);
+ std::set<std::string> getTopLevelModules(const std::string&) const;
private:
@@ -1087,6 +1091,7 @@ private:
FeatureProfile _featureProfile;
std::map<std::string, DefinitionContextPtr> _definitionContextMap;
std::map<int, std::string> _typeIds;
+ std::map< std::string, std::set<std::string> > _fileTopLevelModules;
};
extern SLICE_API Unit* unit; // The current parser for bison/flex
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 16e3aa7c1da..8a8faea76dc 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
@@ -39,7 +39,7 @@ public:
FILE* preprocess(bool, const std::string& = "");
bool close();
- enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP };
+ enum Language { CPlusPlus, Java, JavaXML, CSharp, Python, Ruby, PHP, JS };
bool printMakefileDependencies(Language, const std::vector<std::string>&, const std::string& = "", const std::string& = "cpp",
const std::string& = "");
diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h
index 557e87e7d9d..ece8353073b 100644
--- a/cpp/include/Slice/PythonUtil.h
+++ b/cpp/include/Slice/PythonUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h
index 9c1c53a0c8d..a5dd1949f2c 100644
--- a/cpp/include/Slice/RubyUtil.h
+++ b/cpp/include/Slice/RubyUtil.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h
index 45f7b0c8daa..1710ffa586a 100644
--- a/cpp/include/Slice/Util.h
+++ b/cpp/include/Slice/Util.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.