SmallSenseResultItem ranemd to SmallSensePO.
All subclasses were renamed too.
--- a/Make.proto Tue Jul 23 20:49:19 2013 +0100
+++ b/Make.proto Wed Jul 24 10:54:18 2013 +0100
@@ -18,7 +18,7 @@
# position (of this package) in directory hierarchy:
# (must point to ST/X top directory, for tools and includes)
TOP=../../stx
-INCLUDE_TOP=$(TOP)/../
+INCLUDE_TOP=$(TOP)/..
# subdirectories where targets are to be made:
SUBDIRS=
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/lint -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/goodies/roeltyper
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libwidg2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/lint -I$(INCLUDE_TOP)/stx/goodies/roeltyper -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview
# if you need any additional defines for embedded C code,
@@ -121,34 +121,33 @@
# add more postMake actions here
postMake:: cleanjunk
-prereq: $(REQUIRED_SUPPORT_DIRS)
- cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/helpers && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/changes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/roeltyper && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/refactoring && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/browser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../goodies/refactoryBrowser/lint && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+# build all mandatory prerequisite packages (containing superclasses) for this package
+prereq:
+ cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/refactoryBrowser/helpers && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/refactoryBrowser/browser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/refactoryBrowser/lint && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/goodies/roeltyper && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+# build all packages containing referenced classes for this package
+# they are nor needed to compile the package
+references:
+
+
cleanjunk::
-rm -f *.s *.s2
@@ -165,13 +164,13 @@
$(OUTDIR)SmallSenseCriticsWindow.$(O) SmallSenseCriticsWindow.$(H): SmallSenseCriticsWindow.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseInfo.$(O) SmallSenseInfo.$(H): SmallSenseInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseManager.$(O) SmallSenseManager.$(H): SmallSenseManager.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSensePO.$(O) SmallSensePO.$(H): SmallSensePO.st $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParseNodeInspector.$(O) SmallSenseParseNodeInspector.$(H): SmallSenseParseNodeInspector.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParseNodeVisitor.$(O) SmallSenseParseNodeVisitor.$(H): SmallSenseParseNodeVisitor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParser.$(O) SmallSenseParser.$(H): SmallSenseParser.st $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSensePosition.$(O) SmallSensePosition.$(H): SmallSensePosition.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseQuickFixer.$(O) SmallSenseQuickFixer.$(H): SmallSenseQuickFixer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseRecognizer.$(O) SmallSenseRecognizer.$(H): SmallSenseRecognizer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseResultItem.$(O) SmallSenseResultItem.$(H): SmallSenseResultItem.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseResultSet.$(O) SmallSenseResultSet.$(H): SmallSenseResultSet.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseSelectorNode.$(O) SmallSenseSelectorNode.$(H): SmallSenseSelectorNode.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseService.$(O) SmallSenseService.$(H): SmallSenseService.st $(INCLUDE_TOP)/stx/libtool/Tools__BackgroundSourceProcessingService.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -182,20 +181,20 @@
$(OUTDIR)SmallSenseTypeHolder.$(O) SmallSenseTypeHolder.$(H): SmallSenseTypeHolder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseUnacceptedMethodEnvironment.$(O) SmallSenseUnacceptedMethodEnvironment.$(H): SmallSenseUnacceptedMethodEnvironment.st $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/helpers/BrowserEnvironment.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)jv_smallsense.$(O) jv_smallsense.$(H): jv_smallsense.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseAbstractInstvarInterfaceExtractor.$(O) SmallSenseAbstractInstvarInterfaceExtractor.$(H): SmallSenseAbstractInstvarInterfaceExtractor.st $(INCLUDE_TOP)jv/smallsense/SmallSenseParser.$(H) $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClass.$(O) SmallSenseClass.$(H): SmallSenseClass.st $(INCLUDE_TOP)jv/smallsense/SmallSenseResultItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClassInfo.$(O) SmallSenseClassInfo.$(H): SmallSenseClassInfo.st $(INCLUDE_TOP)jv/smallsense/SmallSenseInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClassType.$(O) SmallSenseClassType.$(H): SmallSenseClassType.st $(INCLUDE_TOP)jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseConstant.$(O) SmallSenseConstant.$(H): SmallSenseConstant.st $(INCLUDE_TOP)jv/smallsense/SmallSenseResultItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseFinder.$(O) SmallSenseFinder.$(H): SmallSenseFinder.st $(INCLUDE_TOP)jv/smallsense/SmallSenseParseNodeVisitor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseInferencer.$(O) SmallSenseInferencer.$(H): SmallSenseInferencer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)jv/smallsense/SmallSenseParseNodeVisitor.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseMethod.$(O) SmallSenseMethod.$(H): SmallSenseMethod.st $(INCLUDE_TOP)jv/smallsense/SmallSenseResultItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseMethodInfo.$(O) SmallSenseMethodInfo.$(H): SmallSenseMethodInfo.st $(INCLUDE_TOP)jv/smallsense/SmallSenseInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseSnippet.$(O) SmallSenseSnippet.$(H): SmallSenseSnippet.st $(INCLUDE_TOP)jv/smallsense/SmallSenseResultItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseUnionType.$(O) SmallSenseUnionType.$(H): SmallSenseUnionType.st $(INCLUDE_TOP)jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseUnknownType.$(O) SmallSenseUnknownType.$(H): SmallSenseUnknownType.st $(INCLUDE_TOP)jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseVariable.$(O) SmallSenseVariable.$(H): SmallSenseVariable.st $(INCLUDE_TOP)jv/smallsense/SmallSenseResultItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseInstvarInterfaceExtractor.$(O) SmallSenseInstvarInterfaceExtractor.$(H): SmallSenseInstvarInterfaceExtractor.st $(INCLUDE_TOP)jv/smallsense/SmallSenseAbstractInstvarInterfaceExtractor.$(H) $(INCLUDE_TOP)jv/smallsense/SmallSenseParser.$(H) $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseAbstractInstvarInterfaceExtractor.$(O) SmallSenseAbstractInstvarInterfaceExtractor.$(H): SmallSenseAbstractInstvarInterfaceExtractor.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseParser.$(H) $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassInfo.$(O) SmallSenseClassInfo.$(H): SmallSenseClassInfo.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassPO.$(O) SmallSenseClassPO.$(H): SmallSenseClassPO.st $(INCLUDE_TOP)/jv/smallsense/SmallSensePO.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassType.$(O) SmallSenseClassType.$(H): SmallSenseClassType.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseConstantPO.$(O) SmallSenseConstantPO.$(H): SmallSenseConstantPO.st $(INCLUDE_TOP)/jv/smallsense/SmallSensePO.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseFinder.$(O) SmallSenseFinder.$(H): SmallSenseFinder.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseParseNodeVisitor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseInferencer.$(O) SmallSenseInferencer.$(H): SmallSenseInferencer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/jv/smallsense/SmallSenseParseNodeVisitor.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseMethodInfo.$(O) SmallSenseMethodInfo.$(H): SmallSenseMethodInfo.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseMethodPO.$(O) SmallSenseMethodPO.$(H): SmallSenseMethodPO.st $(INCLUDE_TOP)/jv/smallsense/SmallSensePO.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseSnippetPO.$(O) SmallSenseSnippetPO.$(H): SmallSenseSnippetPO.st $(INCLUDE_TOP)/jv/smallsense/SmallSensePO.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseUnionType.$(O) SmallSenseUnionType.$(H): SmallSenseUnionType.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseUnknownType.$(O) SmallSenseUnknownType.$(H): SmallSenseUnknownType.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseType.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseVariablePO.$(O) SmallSenseVariablePO.$(H): SmallSenseVariablePO.st $(INCLUDE_TOP)/jv/smallsense/SmallSensePO.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseInstvarInterfaceExtractor.$(O) SmallSenseInstvarInterfaceExtractor.$(H): SmallSenseInstvarInterfaceExtractor.st $(INCLUDE_TOP)/jv/smallsense/SmallSenseAbstractInstvarInterfaceExtractor.$(H) $(INCLUDE_TOP)/jv/smallsense/SmallSenseParser.$(H) $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libcomp/AssignmentNode.$(H) $(INCLUDE_TOP)/stx/libcomp/MessageNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseErrorNode.$(H) $(INCLUDE_TOP)/stx/libcomp/PrimaryNode.$(H) $(INCLUDE_TOP)/stx/libcomp/StatementNode.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libcomp/VariableNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/lint/RBLintRule.$(H) $(INCLUDE_TOP)/stx/goodies/refactoryBrowser/lint/RBTransformationRule.$(H) $(INCLUDE_TOP)/stx/libhtml/HTMLDocumentView.$(H) $(INCLUDE_TOP)/stx/libhtml/HTMLDocumentFrame.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/Make.spec Tue Jul 23 20:49:19 2013 +0100
+++ b/Make.spec Wed Jul 24 10:54:18 2013 +0100
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool_smallsense.
+# automagically generated from the projectDefinition: jv_smallsense.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -50,83 +50,83 @@
STCWARNINGS=-warnNonStandard
COMMON_CLASSES= \
- SmallSenseParseNodeVisitor \
+ SmallSenseChecker \
+ SmallSenseCompletionWindow \
+ SmallSenseCriticsWindow \
SmallSenseInfo \
- SmallSenseFinder \
+ SmallSenseManager \
+ SmallSensePO \
+ SmallSenseParseNodeInspector \
+ SmallSenseParseNodeVisitor \
SmallSenseParser \
+ SmallSensePosition \
+ SmallSenseQuickFixer \
SmallSenseRecognizer \
- SmallSenseResultItem \
SmallSenseResultSet \
SmallSenseSelectorNode \
SmallSenseService \
+ SmallSenseSettingsAppl \
+ SmallSenseType \
SmallSenseTypeCollector \
SmallSenseTypeCollectorCache \
+ SmallSenseTypeHolder \
+ SmallSenseUnacceptedMethodEnvironment \
jv_smallsense \
SmallSenseAbstractInstvarInterfaceExtractor \
- SmallSenseClass \
- SmallSenseConstant \
- SmallSenseMethod \
- SmallSenseSnippet \
- SmallSenseVariable \
- SmallSenseInstvarInterfaceExtractor \
- SmallSenseParseNodeInspector \
- SmallSensePosition \
- SmallSenseType \
+ SmallSenseClassInfo \
+ SmallSenseClassPO \
+ SmallSenseClassType \
+ SmallSenseConstantPO \
+ SmallSenseFinder \
SmallSenseInferencer \
- SmallSenseClassInfo \
- SmallSenseManager \
SmallSenseMethodInfo \
- SmallSenseTypeHolder \
- SmallSenseClassType \
+ SmallSenseMethodPO \
+ SmallSenseSnippetPO \
SmallSenseUnionType \
SmallSenseUnknownType \
- SmallSenseCompletionWindow \
- SmallSenseCriticsWindow \
- SmallSenseUnacceptedMethodEnvironment \
- SmallSenseQuickFixer \
- SmallSenseSettingsAppl \
- SmallSenseChecker \
+ SmallSenseVariablePO \
+ SmallSenseInstvarInterfaceExtractor \
COMMON_OBJS= \
- $(OUTDIR_SLASH)SmallSenseParseNodeVisitor.$(O) \
+ $(OUTDIR_SLASH)SmallSenseChecker.$(O) \
+ $(OUTDIR_SLASH)SmallSenseCompletionWindow.$(O) \
+ $(OUTDIR_SLASH)SmallSenseCriticsWindow.$(O) \
$(OUTDIR_SLASH)SmallSenseInfo.$(O) \
- $(OUTDIR_SLASH)SmallSenseFinder.$(O) \
+ $(OUTDIR_SLASH)SmallSenseManager.$(O) \
+ $(OUTDIR_SLASH)SmallSensePO.$(O) \
+ $(OUTDIR_SLASH)SmallSenseParseNodeInspector.$(O) \
+ $(OUTDIR_SLASH)SmallSenseParseNodeVisitor.$(O) \
$(OUTDIR_SLASH)SmallSenseParser.$(O) \
+ $(OUTDIR_SLASH)SmallSensePosition.$(O) \
+ $(OUTDIR_SLASH)SmallSenseQuickFixer.$(O) \
$(OUTDIR_SLASH)SmallSenseRecognizer.$(O) \
- $(OUTDIR_SLASH)SmallSenseResultItem.$(O) \
$(OUTDIR_SLASH)SmallSenseResultSet.$(O) \
$(OUTDIR_SLASH)SmallSenseSelectorNode.$(O) \
$(OUTDIR_SLASH)SmallSenseService.$(O) \
+ $(OUTDIR_SLASH)SmallSenseSettingsAppl.$(O) \
+ $(OUTDIR_SLASH)SmallSenseType.$(O) \
$(OUTDIR_SLASH)SmallSenseTypeCollector.$(O) \
$(OUTDIR_SLASH)SmallSenseTypeCollectorCache.$(O) \
+ $(OUTDIR_SLASH)SmallSenseTypeHolder.$(O) \
+ $(OUTDIR_SLASH)SmallSenseUnacceptedMethodEnvironment.$(O) \
$(OUTDIR_SLASH)jv_smallsense.$(O) \
$(OUTDIR_SLASH)SmallSenseAbstractInstvarInterfaceExtractor.$(O) \
- $(OUTDIR_SLASH)SmallSenseClass.$(O) \
- $(OUTDIR_SLASH)SmallSenseConstant.$(O) \
- $(OUTDIR_SLASH)SmallSenseMethod.$(O) \
- $(OUTDIR_SLASH)SmallSenseSnippet.$(O) \
- $(OUTDIR_SLASH)SmallSenseVariable.$(O) \
- $(OUTDIR_SLASH)SmallSenseInstvarInterfaceExtractor.$(O) \
- $(OUTDIR_SLASH)SmallSenseParseNodeInspector.$(O) \
- $(OUTDIR_SLASH)SmallSensePosition.$(O) \
- $(OUTDIR_SLASH)SmallSenseType.$(O) \
+ $(OUTDIR_SLASH)SmallSenseClassInfo.$(O) \
+ $(OUTDIR_SLASH)SmallSenseClassPO.$(O) \
+ $(OUTDIR_SLASH)SmallSenseClassType.$(O) \
+ $(OUTDIR_SLASH)SmallSenseConstantPO.$(O) \
+ $(OUTDIR_SLASH)SmallSenseFinder.$(O) \
$(OUTDIR_SLASH)SmallSenseInferencer.$(O) \
- $(OUTDIR_SLASH)SmallSenseClassInfo.$(O) \
- $(OUTDIR_SLASH)SmallSenseManager.$(O) \
$(OUTDIR_SLASH)SmallSenseMethodInfo.$(O) \
- $(OUTDIR_SLASH)SmallSenseTypeHolder.$(O) \
- $(OUTDIR_SLASH)SmallSenseClassType.$(O) \
+ $(OUTDIR_SLASH)SmallSenseMethodPO.$(O) \
+ $(OUTDIR_SLASH)SmallSenseSnippetPO.$(O) \
$(OUTDIR_SLASH)SmallSenseUnionType.$(O) \
$(OUTDIR_SLASH)SmallSenseUnknownType.$(O) \
- $(OUTDIR_SLASH)SmallSenseCompletionWindow.$(O) \
- $(OUTDIR_SLASH)SmallSenseCriticsWindow.$(O) \
- $(OUTDIR_SLASH)SmallSenseUnacceptedMethodEnvironment.$(O) \
- $(OUTDIR_SLASH)SmallSenseQuickFixer.$(O) \
- $(OUTDIR_SLASH)SmallSenseSettingsAppl.$(O) \
- $(OUTDIR_SLASH)SmallSenseChecker.$(O) \
+ $(OUTDIR_SLASH)SmallSenseVariablePO.$(O) \
+ $(OUTDIR_SLASH)SmallSenseInstvarInterfaceExtractor.$(O) \
$(OUTDIR_SLASH)extensions.$(O) \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.init Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+# as filenames are not case sensitive (in a default setup),
+# we cannot use the above trick. Therefore, this file is now named
+# "Makefile.init", and you have to execute "make -f Makefile.init" to
+# get the initial makefile. This is now also done by the toplevel CONFIG
+# script.
+
+.PHONY: run
+
+run: makefile
+ $(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+ $(TOP)/rules/stmkmf
--- a/SmallSenseClass.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-SmallSenseResultItem subclass:#SmallSenseClass
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseClass methodsFor:'accessing'!
-
-icon
-
- icon ifNil:[icon := SystemBrowser iconForClass: subject].
- ^icon
-
- "Created: / 06-04-2011 / 23:36:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-subject: aClass
-
- super subject: aClass.
- name := aClass name.
-
- "Created: / 06-04-2011 / 21:02:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseClass methodsFor:'testing'!
-
-isSmallSenseClass
- ^ true
-! !
-
-!SmallSenseClass class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseClass.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSenseClassPO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,45 @@
+"{ Package: 'jv:smallsense' }"
+
+SmallSensePO subclass:#SmallSenseClassPO
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSenseClassPO methodsFor:'accessing'!
+
+icon
+
+ icon ifNil:[icon := SystemBrowser iconForClass: subject].
+ ^icon
+
+ "Created: / 06-04-2011 / 23:36:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+subject: aClass
+
+ super subject: aClass.
+ name := aClass name.
+
+ "Created: / 06-04-2011 / 21:02:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSenseClassPO methodsFor:'testing'!
+
+isSmallSenseClassPO
+ ^ true
+! !
+
+!SmallSenseClassPO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseClass.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- a/SmallSenseCompletionWindow.st Tue Jul 23 20:49:19 2013 +0100
+++ b/SmallSenseCompletionWindow.st Wed Jul 24 10:54:18 2013 +0100
@@ -174,11 +174,10 @@
handlesKeyPress:key inView:aView
"/Transcript showCR: 'SmallSenseCompletionWindow handlesKeyPress: ' , key.
- key isCharacter ifTrue:[^true].
- ^#(BackSpace Return) includes: key
+ key isCharacter or:[#(BackSpace Return) includes: key]
"Created: / 04-04-2011 / 15:52:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 05-04-2011 / 00:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-07-2013 / 10:48:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
keyPress:key x:x y:y view:aView
@@ -297,7 +296,7 @@
matching size == 1 ifTrue:[
v := matching anElement.
(v := selectionHolder value) notNil ifTrue:[
- (v isSmallSenseVariable or:[v isSmallSenseClass]) ifTrue:[
+ (v isSmallSenseVariablePO or:[v isSmallSenseClassPO]) ifTrue:[
self complete.
^self.
]
--- a/SmallSenseConstant.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-SmallSenseResultItem subclass:#SmallSenseConstant
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseConstant methodsFor:'testing'!
-
-isSmallSenseConstant
- ^ true
-! !
-
-!SmallSenseConstant class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseConstant.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSenseConstantPO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,27 @@
+"{ Package: 'jv:smallsense' }"
+
+SmallSensePO subclass:#SmallSenseConstantPO
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSenseConstantPO methodsFor:'testing'!
+
+isSmallSenseConstantPO
+ ^ true
+! !
+
+!SmallSenseConstantPO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseConstant.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- a/SmallSenseMethod.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-SmallSenseResultItem subclass:#SmallSenseMethod
- instanceVariableNames:'class'
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseMethod class methodsFor:'Instance creation'!
-
-name:name description:description class:class
- ^ (self new)
- name:name;
- description:description;
- class:class.
-
- "Created: / 06-04-2011 / 16:50:05 / Jakub <zelenja7@fel.cvut.cz>"
-! !
-
-!SmallSenseMethod methodsFor:'accessing'!
-
-class:something
- class := something.
-
- "Created: / 06-04-2011 / 16:51:42 / Jakub <zelenja7@fel.cvut.cz>"
-!
-
-cursorColumnAfterComplete
-
- | idx |
- idx := name indexOf: $:.
- ^idx == 0 ifTrue:[name size + 1] ifFalse:[idx + 1].
-
- "Created: / 05-04-2011 / 17:08:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-label
-
- ^super label
-
-"/ label ifNil:
-"/ [label := name asText , ((' [' , class name , ']') asText colorizeAllWith: Color gray).
-"/ ].
-"/ ^label
-
- "Created: / 07-04-2011 / 09:56:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-05-2011 / 10:59:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-stringToComplete
-
- ^String
- fromStringCollection: (name tokensBasedOn: $:)
- separatedBy: ': '.
-
- "Created: / 05-04-2011 / 16:51:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseMethod methodsFor:'displaying'!
-
-displayOn:aGC x:x y:y opaque:opaque
-
- | lw cn cnw fg |
-
- super displayOn:aGC x:x y:y opaque:opaque.
- lw := x + 16 + (self label widthOn: aGC).
- cn := class nameWithoutPrefix.
- cnw := aGC widthOfString: cn.
-
- (aGC width > (lw + cnw + 5)) ifTrue:
- [fg := aGC paint.
- aGC paint: Color gray .
- aGC displayString: cn x: aGC width - cnw - 5 y: y.
- aGC paint: fg.
- ]
-
- "Created: / 21-05-2011 / 11:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseMethod methodsFor:'testing'!
-
-isSmallSenseMethod
- ^ true
-! !
-
-!SmallSenseMethod class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseMethod.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSenseMethodPO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,98 @@
+"{ Package: 'jv:smallsense' }"
+
+SmallSensePO subclass:#SmallSenseMethodPO
+ instanceVariableNames:'class'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSenseMethodPO class methodsFor:'Instance creation'!
+
+name:name description:description class:class
+ ^ (self new)
+ name:name;
+ description:description;
+ class:class.
+
+ "Created: / 06-04-2011 / 16:50:05 / Jakub <zelenja7@fel.cvut.cz>"
+! !
+
+!SmallSenseMethodPO methodsFor:'accessing'!
+
+class:something
+ class := something.
+
+ "Created: / 06-04-2011 / 16:51:42 / Jakub <zelenja7@fel.cvut.cz>"
+!
+
+cursorColumnAfterComplete
+
+ | idx |
+ idx := name indexOf: $:.
+ ^idx == 0 ifTrue:[name size + 1] ifFalse:[idx + 1].
+
+ "Created: / 05-04-2011 / 17:08:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+label
+
+ ^super label
+
+"/ label ifNil:
+"/ [label := name asText , ((' [' , class name , ']') asText colorizeAllWith: Color gray).
+"/ ].
+"/ ^label
+
+ "Created: / 07-04-2011 / 09:56:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 21-05-2011 / 10:59:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+stringToComplete
+
+ ^String
+ fromStringCollection: (name tokensBasedOn: $:)
+ separatedBy: ': '.
+
+ "Created: / 05-04-2011 / 16:51:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSenseMethodPO methodsFor:'displaying'!
+
+displayOn:aGC x:x y:y opaque:opaque
+
+ | lw cn cnw fg |
+
+ super displayOn:aGC x:x y:y opaque:opaque.
+ lw := x + 16 + (self label widthOn: aGC).
+ cn := class nameWithoutPrefix.
+ cnw := aGC widthOfString: cn.
+
+ (aGC width > (lw + cnw + 5)) ifTrue:
+ [fg := aGC paint.
+ aGC paint: Color gray .
+ aGC displayString: cn x: aGC width - cnw - 5 y: y.
+ aGC paint: fg.
+ ]
+
+ "Created: / 21-05-2011 / 11:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSenseMethodPO methodsFor:'testing'!
+
+isSmallSenseMethodPO
+ ^ true
+! !
+
+!SmallSenseMethodPO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseMethod.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSensePO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,184 @@
+"{ Package: 'jv:smallsense' }"
+
+HierarchicalItem subclass:#SmallSensePO
+ instanceVariableNames:'subject icon label name description'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSensePO class methodsFor:'Instance Creation'!
+
+name: name description:description
+
+ ^ self new name:name; description:description.
+
+ "Created: / 04-04-2011 / 13:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSensePO class methodsFor:'Instance creation'!
+
+subject: anObject
+
+ ^self new subject: anObject
+
+ "Created: / 06-04-2011 / 21:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSensePO methodsFor:'accessing'!
+
+cursorColumnAfterComplete
+
+ "Answers a cursor column after completion. The number returned
+ is relative to the start of the text being replaced"
+
+ ^name size + 1
+
+ "Created: / 05-04-2011 / 17:05:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+description
+ ^ description
+!
+
+description:something
+ description := something.
+!
+
+icon
+
+ ^nil
+
+ "Created: / 04-04-2011 / 17:25:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+label
+
+ label ifNil:[label := name].
+ ^label
+
+ "Created: / 07-04-2011 / 09:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+name
+ ^ name
+!
+
+name:something
+ name := something.
+!
+
+stringToComplete
+
+ "Answers a string to complete"
+
+ ^name
+
+ "Created: / 05-04-2011 / 16:48:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+subject
+ ^ subject
+!
+
+subject:something
+ subject := something.
+! !
+
+!SmallSensePO methodsFor:'displaying'!
+
+displayLabel:aLabel h:lH on:aGC x:newX y:y h:h
+ | cx checkedI subjectI app |
+
+ cx := "x :=" newX.
+"/ self displayCheckbox ifTrue:[
+"/ app := self application.
+"/ checkedI := self checked
+"/ ifTrue:[MenuPanel iconIndicationOn]
+"/ ifFalse:[MenuPanel iconIndicationOff].
+"/ checkedI displayOn: aGC x: cx y: y + (h / 2) - (checkedI height / 2).
+"/ cx := cx + 22."experimental value - this looks good"
+"/ ] ifFalse:[
+"/ (parent notNil and: [parent displayCheckbox]) ifTrue:[
+"/ cx := cx + 22."experimental value - this looks good"
+"/ ]
+"/ ].
+
+ subjectI := self icon.
+ subjectI notNil ifTrue:[
+ subjectI displayOn: aGC x: cx y: y + (h / 2) - (subjectI height / 2).
+ ].
+"/ (subjectI notNil or:[parent subjectIcon notNil]) ifTrue:[
+ cx := cx + 16."experimental value - this looks good"
+"/ ].
+
+ super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h
+
+ "Created: / 24-07-2013 / 00:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSensePO methodsFor:'new'!
+
+name:nam description:desc
+ name := nam.
+ description := desc.
+
+ "Created: / 16-03-2011 / 16:31:13 / Jakub <zelenja7@fel.cvut.cz>"
+! !
+
+!SmallSensePO methodsFor:'printing & storing'!
+
+printOn:aStream
+ "append a printed representation if the receiver to the argument, aStream"
+
+ super printOn:aStream.
+ aStream nextPut:$(.
+ name printOn:aStream.
+ aStream nextPut:$).
+
+ "Modified: / 04-04-2011 / 12:02:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSensePO methodsFor:'queries'!
+
+startsWith: prefix
+
+ ^self stringToComplete startsWith: prefix
+
+ "Created: / 26-11-2011 / 19:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSensePO methodsFor:'testing'!
+
+isSmallSenseClassPO
+ ^ false
+!
+
+isSmallSenseConstantPO
+ ^ false
+!
+
+isSmallSenseMethodPO
+ ^ false
+!
+
+isSmallSenseSnippetPO
+ ^ false
+!
+
+isSmallSenseVariablePO
+ ^ false
+! !
+
+!SmallSensePO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseResultItem.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- a/SmallSenseRecognizer.st Tue Jul 23 20:49:19 2013 +0100
+++ b/SmallSenseRecognizer.st Wed Jul 24 10:54:18 2013 +0100
@@ -81,7 +81,7 @@
class := collector klass.
class classVarNames do:[:nm|
(nm startsWith: prefix) ifTrue:[
- resultSet add:(SmallSenseVariable classVariable: nm in: class).
+ resultSet add:(SmallSenseVariablePO classVariable: nm in: class).
].
].
ns := class nameSpace.
@@ -92,9 +92,9 @@
cls := ns classNamed: nm.
cls notNil ifTrue:[
cls isBehavior ifTrue:[
- resultSet add:(SmallSenseClass new subject: cls; name: nm).
+ resultSet add:(SmallSenseClassPO new subject: cls; name: nm).
] ifFalse:[
- resultSet add:(SmallSenseVariable globalVariable: cls).
+ resultSet add:(SmallSenseVariablePO globalVariable: cls).
]
]
].
@@ -105,9 +105,9 @@
cls := Smalltalk classNamed: nm.
cls notNil ifTrue:[
cls isBehavior ifTrue:[
- resultSet add:(SmallSenseClass new subject: cls ).
+ resultSet add:(SmallSenseClassPO new subject: cls ).
] ifFalse:[
- resultSet add:(SmallSenseVariable globalVariable: cls).
+ resultSet add:(SmallSenseVariablePO globalVariable: cls).
]
]
]
@@ -126,7 +126,7 @@
[ class isNil ] whileFalse:[
class
selectorsAndMethodsDo:[:selector :met |
- resultSet add:(SmallSenseMethod
+ resultSet add:(SmallSenseMethodPO
name:selector
description:"met source"nil
class:class).
@@ -142,20 +142,20 @@
"Add Instance variables"
collector klass allInstVarNames do:[:nm|
- resultSet add: (SmallSenseVariable instanceVariable: nm in: collector klass).
+ resultSet add: (SmallSenseVariablePO instanceVariable: nm in: collector klass).
].
"Add pseudo variables"
#(self super here thisContext) do:[:nm|
- resultSet add: (SmallSenseVariable new name: nm).
+ resultSet add: (SmallSenseVariablePO new name: nm).
].
"Add arguments"
collector parser methodArgs ? #() do:[:nm|
- resultSet add: (SmallSenseVariable argument: nm).
+ resultSet add: (SmallSenseVariablePO argument: nm).
].
"Add temporaries"
collector parser methodVars ? #() do:[:nm|
- resultSet add: (SmallSenseVariable variable: nm).
+ resultSet add: (SmallSenseVariablePO variable: nm).
].
"Created: / 26-11-2011 / 17:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -265,7 +265,7 @@
[ class isNil ] whileFalse:[
class
selectorsAndMethodsDo:[:selector :met |
- retCollection add:(SmallSenseMethod
+ retCollection add:(SmallSenseMethodPO
name:selector
description:"met source"nil
class:class).
@@ -359,21 +359,21 @@
|retCollection|
retCollection := SmallSenseResultSet new.
- retCollection add:(SmallSenseSnippet name:'()ifTrue:[].'
+ retCollection add:(SmallSenseSnippetPO name:'()ifTrue:[].'
description:'True block
()ifTrue:[].').
- retCollection add:(SmallSenseSnippet name:'()ifFalse:[].'
+ retCollection add:(SmallSenseSnippetPO name:'()ifFalse:[].'
description:'False block
()ifFalse:[].').
- retCollection add:(SmallSenseSnippet name:'[]whileTrue:[].'
+ retCollection add:(SmallSenseSnippetPO name:'[]whileTrue:[].'
description:'WhileTrue block
()whileTrue:[].').
- retCollection add:(SmallSenseSnippet name:'[]whileFalse:[].'
+ retCollection add:(SmallSenseSnippetPO name:'[]whileFalse:[].'
description:'WhileFalse block
()whileFalse:[].').
retCollection
- add:(SmallSenseSnippet name:'[]' description:'Closure to block').
- retCollection add:(SmallSenseSnippet name:'()' description:'Brackets').
+ add:(SmallSenseSnippetPO name:'[]' description:'Closure to block').
+ retCollection add:(SmallSenseSnippetPO name:'()' description:'Brackets').
^ retCollection.
"Created: / 04-03-2011 / 12:46:15 / Jakub <zelenja7@fel.cvut.cz>"
@@ -389,7 +389,7 @@
retCollection := SmallSenseResultSet new.
(foundNode blockVariables notNil) ifTrue:[
foundNode blockVariables do:[:each |
- retCollection add:(SmallSenseVariable name:each name
+ retCollection add:(SmallSenseVariablePO name:each name
description:'Variables in the method. Defined in block [:val| ]').
].
].
@@ -404,27 +404,27 @@
|retCollection|
retCollection := SmallSenseResultSet new.
- retCollection add:(SmallSenseConstant name:'^'
+ retCollection add:(SmallSenseConstantPO name:'^'
description:'Return symbol from method.
For example: ^ nil').
retCollection
- add:(SmallSenseConstant name:':=' description:'Assignment to variable').
- retCollection add:(SmallSenseConstant name:'self'
+ add:(SmallSenseConstantPO name:':=' description:'Assignment to variable').
+ retCollection add:(SmallSenseConstantPO name:'self'
description:'Reference to self class.
Access to method from this class.
For example: self someMethod.').
- retCollection add:(SmallSenseConstant name:'super'
+ retCollection add:(SmallSenseConstantPO name:'super'
description:'Reference to super class.
Access to method from super class.
For example: super someMethod.').
- retCollection add:(SmallSenseConstant name:'nil'
+ retCollection add:(SmallSenseConstantPO name:'nil'
description:'Nil. In c# or java null. Something empty').
- retCollection add:(SmallSenseConstant name:'true' description:'True.').
- retCollection add:(SmallSenseConstant name:'false' description:'False').
- retCollection add:(SmallSenseConstant name:'#'
+ retCollection add:(SmallSenseConstantPO name:'true' description:'True.').
+ retCollection add:(SmallSenseConstantPO name:'false' description:'False').
+ retCollection add:(SmallSenseConstantPO name:'#'
description:'Symbol reference.
For example: #Symbol').
- retCollection add:(SmallSenseConstant name:'$'
+ retCollection add:(SmallSenseConstantPO name:'$'
description:'Character symbol.
For example #a').
^retCollection.
@@ -444,27 +444,27 @@
].
(collector methodArgs notNil) ifTrue:[
collector methodArgs do:[:each |
- retCollection add:(SmallSenseVariable name:each
+ retCollection add:(SmallSenseVariablePO name:each
description:'Arguments in the method. Defined in method:val').
].
].
roelTyper := self doForSource:collector.
roelTyper instVars do:[:var |
- retCollection add:(SmallSenseVariable name:var
+ retCollection add:(SmallSenseVariablePO name:var
description:'Instance variables. Variables defined in instanceVariableNames')
].
helper := roelTyper localTypingResults
at:roelTyper currentExtractedMethod.
helper do:[:each |
(each tempName notNil) ifTrue:[
- retCollection add:(SmallSenseVariable name:each tempName
+ retCollection add:(SmallSenseVariablePO name:each tempName
description:'Variables in the method. Defined in |val val2|').
].
].
class := collector targetClass.
[ class notNil ] whileTrue:[
class classVarNames do:[:each |
- retCollection add:(SmallSenseVariable name:each
+ retCollection add:(SmallSenseVariablePO name:each
description:'Class variables. Variables defined in classVariableNames').
].
class := class superclass.
@@ -488,7 +488,7 @@
(collector methodArgs notNil) ifTrue:[
collector methodArgs do:[:each |
(each asLowercase startsWith:nodeName asLowercase) ifTrue:[
- retCollection add:(SmallSenseVariable name:each
+ retCollection add:(SmallSenseVariablePO name:each
description:'Arguments in the method. Defined in method:val').
].
].
@@ -496,7 +496,7 @@
roelTyper := self doForSource:collector.
roelTyper instVars do:[:var |
(var asLowercase startsWith:nodeName asLowercase) ifTrue:[
- retCollection add:(SmallSenseVariable name:var
+ retCollection add:(SmallSenseVariablePO name:var
description:'Instance variables. Variables defined in instanceVariableNames')
].
].
@@ -505,7 +505,7 @@
helper do:[:each |
(each tempName notNil) ifTrue:[
(each tempName asLowercase startsWith:nodeName asLowercase) ifTrue:[
- retCollection add:(SmallSenseVariable name:each tempName
+ retCollection add:(SmallSenseVariablePO name:each tempName
description:'Variables in the method. Defined in |val val2|').
].
].
@@ -514,7 +514,7 @@
[ class notNil ] whileTrue:[
class classVarNames do:[:each |
(each asLowercase startsWith:nodeName asLowercase) ifTrue:[
- retCollection add:(SmallSenseVariable name:each
+ retCollection add:(SmallSenseVariablePO name:each
description:'Class variables. Variables defined in classVariableNames').
].
].
@@ -604,7 +604,7 @@
retCollection := SmallSenseResultSet new.
classes do:[:cls |
retCollection
- add:(SmallSenseClass subject: cls)
+ add:(SmallSenseClassPO subject: cls)
].
^ retCollection.
@@ -633,14 +633,14 @@
^ nil.
].
(node isSelf) ifTrue:[
- retCollection add:(SmallSenseConstant name:'self'
+ retCollection add:(SmallSenseConstantPO name:'self'
description:'Reference to self class.
Access to method from this class.
For example: self someMethod.').
^ retCollection.
].
(node isSuper) ifTrue:[
- retCollection add:(SmallSenseConstant name:'super'
+ retCollection add:(SmallSenseConstantPO name:'super'
description:'Reference to super class.
Access to method from super class.
For example: super someMethod.').
--- a/SmallSenseResultItem.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-Object subclass:#SmallSenseResultItem
- instanceVariableNames:'subject icon label name description'
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseResultItem class methodsFor:'Instance Creation'!
-
-name: name description:description
-
- ^ self new name:name; description:description.
-
- "Created: / 04-04-2011 / 13:46:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseResultItem class methodsFor:'Instance creation'!
-
-subject: anObject
-
- ^self new subject: anObject
-
- "Created: / 06-04-2011 / 21:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseResultItem methodsFor:'accessing'!
-
-cursorColumnAfterComplete
-
- "Answers a cursor column after completion. The number returned
- is relative to the start of the text being replaced"
-
- ^name size + 1
-
- "Created: / 05-04-2011 / 17:05:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-description
- ^ description
-!
-
-description:something
- description := something.
-!
-
-icon
-
- ^nil
-
- "Created: / 04-04-2011 / 17:25:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-label
-
- label ifNil:[label := name].
- ^label
-
- "Created: / 07-04-2011 / 09:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-name
- ^ name
-!
-
-name:something
- name := something.
-!
-
-stringToComplete
-
- "Answers a string to complete"
-
- ^name
-
- "Created: / 05-04-2011 / 16:48:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-subject
- ^ subject
-!
-
-subject:something
- subject := something.
-! !
-
-!SmallSenseResultItem methodsFor:'displaying'!
-
-displayOn:aGc x:x y:y opaque:opaque
-
- | icon |
- icon := self icon.
- icon ifNotNil:[icon displayOn:aGc x:x y:y - icon height opaque:opaque].
- self label displayOn:aGc x:x + 16 y:y opaque:opaque
-
- "Created: / 04-04-2011 / 17:25:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 08-04-2011 / 22:36:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseResultItem methodsFor:'new'!
-
-name:nam description:desc
- name := nam.
- description := desc.
-
- "Created: / 16-03-2011 / 16:31:13 / Jakub <zelenja7@fel.cvut.cz>"
-! !
-
-!SmallSenseResultItem methodsFor:'printing & storing'!
-
-printOn:aStream
- "append a printed representation if the receiver to the argument, aStream"
-
- super printOn:aStream.
- aStream nextPut:$(.
- name printOn:aStream.
- aStream nextPut:$).
-
- "Modified: / 04-04-2011 / 12:02:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseResultItem methodsFor:'queries'!
-
-startsWith: prefix
-
- ^self stringToComplete startsWith: prefix
-
- "Created: / 26-11-2011 / 19:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseResultItem methodsFor:'testing'!
-
-isSmallSenseClass
- ^ false
-!
-
-isSmallSenseConstant
- ^ false
-!
-
-isSmallSenseMethod
- ^ false
-!
-
-isSmallSenseSnippet
- ^ false
-!
-
-isSmallSenseVariable
- ^ false
-! !
-
-!SmallSenseResultItem class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseResultItem.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- a/SmallSenseSnippet.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-SmallSenseResultItem subclass:#SmallSenseSnippet
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseSnippet methodsFor:'testing'!
-
-isSmallSenseSnippet
- ^ true
-! !
-
-!SmallSenseSnippet class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseSnippet.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSenseSnippetPO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,27 @@
+"{ Package: 'jv:smallsense' }"
+
+SmallSensePO subclass:#SmallSenseSnippetPO
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSenseSnippetPO methodsFor:'testing'!
+
+isSmallSenseSnippetPO
+ ^ true
+! !
+
+!SmallSenseSnippetPO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseSnippet.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- a/SmallSenseVariable.st Tue Jul 23 20:49:19 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-"{ Package: 'jv:smallsense' }"
-
-SmallSenseResultItem subclass:#SmallSenseVariable
- instanceVariableNames:'class type'
- classVariableNames:''
- poolDictionaries:''
- category:'SmallSense-Core'
-!
-
-
-!SmallSenseVariable class methodsFor:'instance creation'!
-
-argument: name
-
- ^self new name: name; type: #MethodArg
-
- "Created: / 26-11-2011 / 18:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-classVariable: name in: class
-
- ^self new name: name; type: #ClassVar; class: class
-
- "Created: / 26-11-2011 / 18:46:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-globalVariable: name
-
- ^self new name: name; type: #Global
-
- "Created: / 26-11-2011 / 18:57:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-instanceVariable: name in: class
-
- ^self new name: name; type: #InstanceVar; class: class
-
- "Created: / 26-11-2011 / 18:45:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-variable: name
-
- ^self new name: name; type: #MethodVar
-
- "Created: / 26-11-2011 / 18:45:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseVariable methodsFor:'accessing'!
-
-class:something
- class := something.
-
- "Created: / 06-04-2011 / 16:51:42 / Jakub <zelenja7@fel.cvut.cz>"
-!
-
-stringToComplete
-
- "Answers a string to complete"
-
- ^name , ' '
-
- "Created: / 20-05-2011 / 13:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-type:something
- type := something.
-! !
-
-!SmallSenseVariable methodsFor:'displaying'!
-
-displayOn:aGC x:x y:y opaque:opaque
-
- | lw cn cnw fg |
-
- super displayOn:aGC x:x y:y opaque:opaque.
-
- class isNil ifTrue:[^self].
-
- lw := x + 16 + (self label widthOn: aGC).
- cn := class nameWithoutPrefix.
- cnw := aGC widthOfString: cn.
-
- (aGC width > (lw + cnw + 5)) ifTrue:
- [fg := aGC paint.
- aGC paint: Color gray .
- aGC displayString: cn x: aGC width - cnw - 5 y: y.
- aGC paint: fg.
- ]
-
- "Created: / 21-05-2011 / 11:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!SmallSenseVariable methodsFor:'testing'!
-
-isSmallSenseVariable
- ^ true
-! !
-
-!SmallSenseVariable class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '$Id: SmallSenseVariable.st 7825 2011-11-26 18:32:31Z vranyj1 $'
-! !
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SmallSenseVariablePO.st Wed Jul 24 10:54:18 2013 +0100
@@ -0,0 +1,109 @@
+"{ Package: 'jv:smallsense' }"
+
+SmallSensePO subclass:#SmallSenseVariablePO
+ instanceVariableNames:'class type'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'SmallSense-Interface-PO'
+!
+
+
+!SmallSenseVariablePO class methodsFor:'instance creation'!
+
+argument: name
+
+ ^self new name: name; type: #MethodArg
+
+ "Created: / 26-11-2011 / 18:45:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+classVariable: name in: class
+
+ ^self new name: name; type: #ClassVar; class: class
+
+ "Created: / 26-11-2011 / 18:46:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+globalVariable: name
+
+ ^self new name: name; type: #Global
+
+ "Created: / 26-11-2011 / 18:57:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+instanceVariable: name in: class
+
+ ^self new name: name; type: #InstanceVar; class: class
+
+ "Created: / 26-11-2011 / 18:45:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+variable: name
+
+ ^self new name: name; type: #MethodVar
+
+ "Created: / 26-11-2011 / 18:45:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSenseVariablePO methodsFor:'accessing'!
+
+class:something
+ class := something.
+
+ "Created: / 06-04-2011 / 16:51:42 / Jakub <zelenja7@fel.cvut.cz>"
+!
+
+stringToComplete
+
+ "Answers a string to complete"
+
+ ^name , ' '
+
+ "Created: / 20-05-2011 / 13:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+type:something
+ type := something.
+! !
+
+!SmallSenseVariablePO methodsFor:'displaying'!
+
+displayOn:aGC x:x y:y opaque:opaque
+
+ | lw cn cnw fg |
+
+ super displayOn:aGC x:x y:y opaque:opaque.
+
+ class isNil ifTrue:[^self].
+
+ lw := x + 16 + (self label widthOn: aGC).
+ cn := class nameWithoutPrefix.
+ cnw := aGC widthOfString: cn.
+
+ (aGC width > (lw + cnw + 5)) ifTrue:
+ [fg := aGC paint.
+ aGC paint: Color gray .
+ aGC displayString: cn x: aGC width - cnw - 5 y: y.
+ aGC paint: fg.
+ ]
+
+ "Created: / 21-05-2011 / 11:02:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!SmallSenseVariablePO methodsFor:'testing'!
+
+isSmallSenseVariablePO
+ ^ true
+! !
+
+!SmallSenseVariablePO class methodsFor:'documentation'!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
+version_SVN
+ ^ '$Id: SmallSenseVariable.st 7825 2011-11-26 18:32:31Z vranyj1 $'
+! !
+
--- a/abbrev.stc Tue Jul 23 20:49:19 2013 +0100
+++ b/abbrev.stc Wed Jul 24 10:54:18 2013 +0100
@@ -1,44 +1,44 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
-SmallSenseParseNodeVisitor SmallSenseParseNodeVisitor jv:smallsense 'SmallSense-Core' 0
+SmallSenseBaseTestClass SmallSenseBaseTestClass jv:smallsense 'SmallSense-Tests' 1
+SmallSenseChecker SmallSenseChecker jv:smallsense 'SmallSense-Lint' 0
+SmallSenseCompletionWindow SmallSenseCompletionWindow jv:smallsense 'SmallSense-Interface' 1
+SmallSenseCriticsWindow SmallSenseCriticsWindow jv:smallsense 'SmallSense-Interface' 1
+SmallSenseFinderTests SmallSenseFinderTests jv:smallsense 'SmallSense-Tests' 1
SmallSenseInfo SmallSenseInfo jv:smallsense 'SmallSense-Model' 0
-SmallSenseBaseTestClass SmallSenseBaseTestClass jv:smallsense 'SmallSense-Tests' 1
-SmallSenseFinder SmallSenseFinder jv:smallsense 'SmallSense-Core' 0
-SmallSenseFinderTests SmallSenseFinderTests jv:smallsense 'SmallSense-Tests' 1
+SmallSenseManager SmallSenseManager jv:smallsense 'SmallSense-Model' 0
+SmallSensePO SmallSensePO jv:smallsense 'SmallSense-Interface-PO' 0
+SmallSenseParseNodeInspector SmallSenseParseNodeInspector jv:smallsense 'SmallSense-Interface' 1
+SmallSenseParseNodeVisitor SmallSenseParseNodeVisitor jv:smallsense 'SmallSense-Core' 0
SmallSenseParser SmallSenseParser jv:smallsense 'SmallSense-Core' 3
SmallSenseParserTests SmallSenseParserTests jv:smallsense 'SmallSense-Tests' 1
+SmallSensePosition SmallSensePosition jv:smallsense 'SmallSense-Core' 0
+SmallSenseQuickFixer SmallSenseQuickFixer jv:smallsense 'SmallSense-Lint' 0
SmallSenseRecognizer SmallSenseRecognizer jv:smallsense 'SmallSense-Core' 0
SmallSenseRecognizerTests SmallSenseRecognizerTests jv:smallsense 'SmallSense-Tests' 1
-SmallSenseResultItem SmallSenseResultItem jv:smallsense 'SmallSense-Core' 0
SmallSenseResultSet SmallSenseResultSet jv:smallsense 'SmallSense-Core' 0
SmallSenseSelectorNode SmallSenseSelectorNode jv:smallsense 'SmallSense-Core' 0
SmallSenseService SmallSenseService jv:smallsense 'SmallSense-Interface' 0
+SmallSenseSettingsAppl SmallSenseSettingsAppl jv:smallsense 'SmallSense-Interface' 1
SmallSenseTestCase SmallSenseTestCase jv:smallsense 'SmallSense-Tests' 1
+SmallSenseType SmallSenseType jv:smallsense 'SmallSense-Types' 0
SmallSenseTypeCollector SmallSenseTypeCollector jv:smallsense 'SmallSense-Roel Typer' 0
SmallSenseTypeCollectorCache SmallSenseTypeCollectorCache jv:smallsense 'SmallSense-Roel Typer' 0
-stx_libtool_smallsense stx_libtool_smallsense jv:smallsense '* Projects & Packages *' 3
+SmallSenseTypeHolder SmallSenseTypeHolder jv:smallsense 'SmallSense-Types' 0
+SmallSenseUnacceptedMethodEnvironment SmallSenseUnacceptedMethodEnvironment jv:smallsense 'SmallSense-Lint' 0
+jv_smallsense jv_smallsense jv:smallsense '* Projects & Packages *' 3
SmallSenseAbstractInstvarInterfaceExtractor SmallSenseAbstractInstvarInterfaceExtractor jv:smallsense 'SmallSense-Roel Typer' 3
-SmallSenseClass SmallSenseClass jv:smallsense 'SmallSense-Core' 0
-SmallSenseConstant SmallSenseConstant jv:smallsense 'SmallSense-Core' 0
-SmallSenseMethod SmallSenseMethod jv:smallsense 'SmallSense-Core' 0
-SmallSenseSnippet SmallSenseSnippet jv:smallsense 'SmallSense-Core' 0
-SmallSenseVariable SmallSenseVariable jv:smallsense 'SmallSense-Core' 0
-SmallSenseInstvarInterfaceExtractor SmallSenseInstvarInterfaceExtractor jv:smallsense 'SmallSense-Roel Typer' 3
-SmallSenseParseNodeInspector SmallSenseParseNodeInspector jv:smallsense 'SmallSense-Interface' 1
-SmallSensePosition SmallSensePosition jv:smallsense 'SmallSense-Core' 0
-SmallSenseType SmallSenseType jv:smallsense 'SmallSense-Types' 0
+SmallSenseClassInfo SmallSenseClassInfo jv:smallsense 'SmallSense-Model' 0
+SmallSenseClassPO SmallSenseClassPO jv:smallsense 'SmallSense-Interface-PO' 0
+SmallSenseClassType SmallSenseClassType jv:smallsense 'SmallSense-Types' 0
+SmallSenseConstantPO SmallSenseConstantPO jv:smallsense 'SmallSense-Interface-PO' 0
+SmallSenseFinder SmallSenseFinder jv:smallsense 'SmallSense-Core' 0
SmallSenseInferencer SmallSenseInferencer jv:smallsense 'SmallSense-Inference' 0
-SmallSenseClassInfo SmallSenseClassInfo jv:smallsense 'SmallSense-Model' 0
-SmallSenseManager SmallSenseManager jv:smallsense 'SmallSense-Model' 0
SmallSenseMethodInfo SmallSenseMethodInfo jv:smallsense 'SmallSense-Model' 0
-SmallSenseTypeHolder SmallSenseTypeHolder jv:smallsense 'SmallSense-Types' 0
-SmallSenseClassType SmallSenseClassType jv:smallsense 'SmallSense-Types' 0
+SmallSenseMethodPO SmallSenseMethodPO jv:smallsense 'SmallSense-Interface-PO' 0
+SmallSenseSnippetPO SmallSenseSnippetPO jv:smallsense 'SmallSense-Interface-PO' 0
SmallSenseUnionType SmallSenseUnionType jv:smallsense 'SmallSense-Types' 0
SmallSenseUnknownType SmallSenseUnknownType jv:smallsense 'SmallSense-Types' 1
-SmallSenseCompletionWindow SmallSenseCompletionWindow jv:smallsense 'SmallSense-Interface' 1
-SmallSenseCriticsWindow SmallSenseCriticsWindow jv:smallsense 'SmallSense-Interface' 1
-SmallSenseUnacceptedMethodEnvironment SmallSenseUnacceptedMethodEnvironment jv:smallsense 'SmallSense-Lint' 0
-SmallSenseQuickFixer SmallSenseQuickFixer jv:smallsense 'SmallSense-Lint' 0
-SmallSenseSettingsAppl SmallSenseSettingsAppl jv:smallsense 'SmallSense-Interface' 1
-SmallSenseChecker SmallSenseChecker jv:smallsense 'SmallSense-Lint' 0
+SmallSenseVariablePO SmallSenseVariablePO jv:smallsense 'SmallSense-Interface-PO' 0
+SmallSenseInstvarInterfaceExtractor SmallSenseInstvarInterfaceExtractor jv:smallsense 'SmallSense-Roel Typer' 3
--- a/bc.mak Tue Jul 23 20:49:19 2013 +0100
+++ b/bc.mak Wed Jul 24 10:54:18 2013 +0100
@@ -20,7 +20,7 @@
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
#
-TOP=..\..
+TOP=..\..\stx
INCLUDE_TOP=$(TOP)\..
@@ -30,11 +30,11 @@
!INCLUDE Make.spec
LIBNAME=libjv_smallsense
-RESFILES=smallsense.res
+RESFILES=smallsense.$(RES)
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\lint -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\goodies\roeltyper
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libwidg2 -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\lint -I$(INCLUDE_TOP)\stx\goodies\roeltyper -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -48,32 +48,26 @@
!INCLUDE $(TOP)\rules\stdRules_bc
-# build all prerequisite packages for this package
+# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
- pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libcompat & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\roeltyper & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\refactoring & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\browser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\lint & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\refactoryBrowser\browser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\refactoryBrowser\lint & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\goodies\roeltyper & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
@@ -83,6 +77,10 @@
test: $(TOP)\goodies\builder\reports\NUL
pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+
+clean::
+ del *.$(CSUFFIX)
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)SmallSenseChecker.$(O) SmallSenseChecker.$(H): SmallSenseChecker.st $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\lint\SmalllintChecker.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -90,13 +88,13 @@
$(OUTDIR)SmallSenseCriticsWindow.$(O) SmallSenseCriticsWindow.$(H): SmallSenseCriticsWindow.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseInfo.$(O) SmallSenseInfo.$(H): SmallSenseInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseManager.$(O) SmallSenseManager.$(H): SmallSenseManager.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSensePO.$(O) SmallSensePO.$(H): SmallSensePO.st $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParseNodeInspector.$(O) SmallSenseParseNodeInspector.$(H): SmallSenseParseNodeInspector.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParseNodeVisitor.$(O) SmallSenseParseNodeVisitor.$(H): SmallSenseParseNodeVisitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseParser.$(O) SmallSenseParser.$(H): SmallSenseParser.st $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSensePosition.$(O) SmallSensePosition.$(H): SmallSensePosition.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseQuickFixer.$(O) SmallSenseQuickFixer.$(H): SmallSenseQuickFixer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseRecognizer.$(O) SmallSenseRecognizer.$(H): SmallSenseRecognizer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseResultItem.$(O) SmallSenseResultItem.$(H): SmallSenseResultItem.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseResultSet.$(O) SmallSenseResultSet.$(H): SmallSenseResultSet.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseSelectorNode.$(O) SmallSenseSelectorNode.$(H): SmallSenseSelectorNode.st $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseService.$(O) SmallSenseService.$(H): SmallSenseService.st $(INCLUDE_TOP)\stx\libtool\Tools__BackgroundSourceProcessingService.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -107,20 +105,20 @@
$(OUTDIR)SmallSenseTypeHolder.$(O) SmallSenseTypeHolder.$(H): SmallSenseTypeHolder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SmallSenseUnacceptedMethodEnvironment.$(O) SmallSenseUnacceptedMethodEnvironment.$(H): SmallSenseUnacceptedMethodEnvironment.st $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\helpers\BrowserEnvironment.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)jv_smallsense.$(O) jv_smallsense.$(H): jv_smallsense.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseAbstractInstvarInterfaceExtractor.$(O) SmallSenseAbstractInstvarInterfaceExtractor.$(H): SmallSenseAbstractInstvarInterfaceExtractor.st $(INCLUDE_TOP)jv\smallsense\SmallSenseParser.$(H) $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClass.$(O) SmallSenseClass.$(H): SmallSenseClass.st $(INCLUDE_TOP)jv\smallsense\SmallSenseResultItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClassInfo.$(O) SmallSenseClassInfo.$(H): SmallSenseClassInfo.st $(INCLUDE_TOP)jv\smallsense\SmallSenseInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseClassType.$(O) SmallSenseClassType.$(H): SmallSenseClassType.st $(INCLUDE_TOP)jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseConstant.$(O) SmallSenseConstant.$(H): SmallSenseConstant.st $(INCLUDE_TOP)jv\smallsense\SmallSenseResultItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseFinder.$(O) SmallSenseFinder.$(H): SmallSenseFinder.st $(INCLUDE_TOP)jv\smallsense\SmallSenseParseNodeVisitor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseInferencer.$(O) SmallSenseInferencer.$(H): SmallSenseInferencer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)jv\smallsense\SmallSenseParseNodeVisitor.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseMethod.$(O) SmallSenseMethod.$(H): SmallSenseMethod.st $(INCLUDE_TOP)jv\smallsense\SmallSenseResultItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseMethodInfo.$(O) SmallSenseMethodInfo.$(H): SmallSenseMethodInfo.st $(INCLUDE_TOP)jv\smallsense\SmallSenseInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseSnippet.$(O) SmallSenseSnippet.$(H): SmallSenseSnippet.st $(INCLUDE_TOP)jv\smallsense\SmallSenseResultItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseUnionType.$(O) SmallSenseUnionType.$(H): SmallSenseUnionType.st $(INCLUDE_TOP)jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseUnknownType.$(O) SmallSenseUnknownType.$(H): SmallSenseUnknownType.st $(INCLUDE_TOP)jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseVariable.$(O) SmallSenseVariable.$(H): SmallSenseVariable.st $(INCLUDE_TOP)jv\smallsense\SmallSenseResultItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SmallSenseInstvarInterfaceExtractor.$(O) SmallSenseInstvarInterfaceExtractor.$(H): SmallSenseInstvarInterfaceExtractor.st $(INCLUDE_TOP)jv\smallsense\SmallSenseAbstractInstvarInterfaceExtractor.$(H) $(INCLUDE_TOP)jv\smallsense\SmallSenseParser.$(H) $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseAbstractInstvarInterfaceExtractor.$(O) SmallSenseAbstractInstvarInterfaceExtractor.$(H): SmallSenseAbstractInstvarInterfaceExtractor.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseParser.$(H) $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassInfo.$(O) SmallSenseClassInfo.$(H): SmallSenseClassInfo.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassPO.$(O) SmallSenseClassPO.$(H): SmallSenseClassPO.st $(INCLUDE_TOP)\jv\smallsense\SmallSensePO.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseClassType.$(O) SmallSenseClassType.$(H): SmallSenseClassType.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseConstantPO.$(O) SmallSenseConstantPO.$(H): SmallSenseConstantPO.st $(INCLUDE_TOP)\jv\smallsense\SmallSensePO.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseFinder.$(O) SmallSenseFinder.$(H): SmallSenseFinder.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseParseNodeVisitor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseInferencer.$(O) SmallSenseInferencer.$(H): SmallSenseInferencer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\jv\smallsense\SmallSenseParseNodeVisitor.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseMethodInfo.$(O) SmallSenseMethodInfo.$(H): SmallSenseMethodInfo.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseMethodPO.$(O) SmallSenseMethodPO.$(H): SmallSenseMethodPO.st $(INCLUDE_TOP)\jv\smallsense\SmallSensePO.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseSnippetPO.$(O) SmallSenseSnippetPO.$(H): SmallSenseSnippetPO.st $(INCLUDE_TOP)\jv\smallsense\SmallSensePO.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseUnionType.$(O) SmallSenseUnionType.$(H): SmallSenseUnionType.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseUnknownType.$(O) SmallSenseUnknownType.$(H): SmallSenseUnknownType.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseType.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseVariablePO.$(O) SmallSenseVariablePO.$(H): SmallSenseVariablePO.st $(INCLUDE_TOP)\jv\smallsense\SmallSensePO.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)SmallSenseInstvarInterfaceExtractor.$(O) SmallSenseInstvarInterfaceExtractor.$(H): SmallSenseInstvarInterfaceExtractor.st $(INCLUDE_TOP)\jv\smallsense\SmallSenseAbstractInstvarInterfaceExtractor.$(H) $(INCLUDE_TOP)\jv\smallsense\SmallSenseParser.$(H) $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libcomp\AssignmentNode.$(H) $(INCLUDE_TOP)\stx\libcomp\MessageNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseErrorNode.$(H) $(INCLUDE_TOP)\stx\libcomp\PrimaryNode.$(H) $(INCLUDE_TOP)\stx\libcomp\StatementNode.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libcomp\VariableNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\lint\RBLintRule.$(H) $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\lint\RBTransformationRule.$(H) $(INCLUDE_TOP)\stx\libhtml\HTMLDocumentView.$(H) $(INCLUDE_TOP)\stx\libhtml\HTMLDocumentFrame.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/extensions.st Tue Jul 23 20:49:19 2013 +0100
+++ b/extensions.st Wed Jul 24 10:54:18 2013 +0100
@@ -282,4 +282,4 @@
extensionsVersion_HG
^ '$Changeset: <not expanded> $'
-! !
\ No newline at end of file
+! !
--- a/jv_smallsense.st Tue Jul 23 20:49:19 2013 +0100
+++ b/jv_smallsense.st Wed Jul 24 10:54:18 2013 +0100
@@ -7,11 +7,6 @@
category:'* Projects & Packages *'
!
-!jv_smallsense class methodsFor:'documentation'!
-
-extensionsVersion_SVN
- ^ '$Id:: extensions.st 7983 2012-04-19 08:02:50Z vranyj1 $'
-! !
!jv_smallsense class methodsFor:'description'!
@@ -23,6 +18,30 @@
)
!
+mandatoryPreRequisites
+ "list all required mandatory packages.
+ Packages are mandatory, if they contain superclasses of the package's classes
+ or classes which are extended by this package.
+ This list can be maintained manually or (better) generated and
+ updated by scanning the superclass hierarchies
+ (the browser has a menu function for that)"
+
+ ^ #(
+ #'stx:goodies/refactoryBrowser/helpers' "BrowserEnvironment - superclass of SmallSenseUnacceptedMethodEnvironment "
+ #'stx:goodies/refactoryBrowser/lint' "RBLintRule - extended "
+ #'stx:goodies/roeltyper' "TypeCollector - superclass of SmallSenseTypeCollector "
+ #'stx:goodies/sunit' "TestAsserter - superclass of SmallSenseTestCase "
+ #'stx:libbasic' "Autoload - superclass of SmallSenseBaseTestClass "
+ #'stx:libbasic2' "CacheDictionary - superclass of SmallSenseTypeCollectorCache "
+ #'stx:libcomp' "AbstractSyntaxHighlighter - superclass of SmallSenseAbstractInstvarInterfaceExtractor "
+ #'stx:libhtml' "HTMLDocumentFrame - extended "
+ #'stx:libtool' "AbstractSettingsApplication - superclass of SmallSenseSettingsAppl "
+ #'stx:libview' "DeviceGraphicsContext - extended "
+ #'stx:libview2' "ApplicationModel - superclass of SmallSenseCompletionWindow "
+ #'stx:libwidg2' "HierarchicalItem - superclass of SmallSenseClassPO "
+ )
+!
+
preRequisites
"list all required packages.
This list can be maintained manually or (better) generated and
@@ -47,6 +66,29 @@
#'stx:libwidg'
#'stx:libwidg2' "HierarchicalItem - superclass of SmallSenseParseNodeInspector::ParseNodeItem "
)
+!
+
+referencedPreRequisites
+ "list all packages containing classes referenced by the packages's members.
+ This list can be maintained manually or (better) generated and
+ updated by looking for global variable accesses
+ (the browser has a menu function for that)
+ However, often too much is found, and you may want to explicitely
+ exclude individual packages in the #excludedFromPreRequisites method."
+
+ ^ #(
+ #'stx:libbasic3' "ChangeSet - referenced by RBTransformationRule>>fixes: "
+ )
+!
+
+subProjects
+ "list packages which are known as subprojects.
+ The generated makefile will enter those and make there as well.
+ However: they are not forced to be loaded when a package is loaded;
+ for those, redefine requiredPrerequisites"
+
+ ^ #(
+ )
! !
!jv_smallsense class methodsFor:'description - contents'!
@@ -59,50 +101,48 @@
^ #(
"<className> or (<className> attributes...) in load order"
- SmallSenseParseNodeVisitor
+ (SmallSenseBaseTestClass autoload)
+ SmallSenseChecker
+ SmallSenseCompletionWindow
+ SmallSenseCriticsWindow
+ (SmallSenseFinderTests autoload)
SmallSenseInfo
- (SmallSenseBaseTestClass autoload)
- SmallSenseFinder
- (SmallSenseFinderTests autoload)
+ SmallSenseManager
+ SmallSensePO
+ SmallSenseParseNodeInspector
+ SmallSenseParseNodeVisitor
SmallSenseParser
(SmallSenseParserTests autoload)
+ SmallSensePosition
+ SmallSenseQuickFixer
SmallSenseRecognizer
(SmallSenseRecognizerTests autoload)
- SmallSenseResultItem
SmallSenseResultSet
SmallSenseSelectorNode
SmallSenseService
+ SmallSenseSettingsAppl
(SmallSenseTestCase autoload)
+ SmallSenseType
SmallSenseTypeCollector
SmallSenseTypeCollectorCache
+ SmallSenseTypeHolder
+ SmallSenseUnacceptedMethodEnvironment
#'jv_smallsense'
SmallSenseAbstractInstvarInterfaceExtractor
- SmallSenseClass
- SmallSenseConstant
- SmallSenseMethod
- SmallSenseSnippet
- SmallSenseVariable
- SmallSenseInstvarInterfaceExtractor
- SmallSenseParseNodeInspector
- SmallSensePosition
- SmallSenseType
+ SmallSenseClassInfo
+ SmallSenseClassPO
+ SmallSenseClassType
+ SmallSenseConstantPO
+ SmallSenseFinder
SmallSenseInferencer
- SmallSenseClassInfo
- SmallSenseManager
SmallSenseMethodInfo
- SmallSenseTypeHolder
- SmallSenseClassType
+ SmallSenseMethodPO
+ SmallSenseSnippetPO
SmallSenseUnionType
SmallSenseUnknownType
- SmallSenseCompletionWindow
- SmallSenseCriticsWindow
- SmallSenseUnacceptedMethodEnvironment
- SmallSenseQuickFixer
- SmallSenseSettingsAppl
- SmallSenseChecker
+ SmallSenseVariablePO
+ SmallSenseInstvarInterfaceExtractor
)
-
- "Modified: / 26-02-2013 / 12:35:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
extensionMethodNames
@@ -135,8 +175,6 @@
UserPreferences smallSenseBackgroundTypingEnabled:
HTMLDocumentView doQuickFix:
)
-
- "Modified: / 26-02-2013 / 12:30:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!jv_smallsense class methodsFor:'description - project information'!
--- a/libInit.cc Tue Jul 23 20:49:19 2013 +0100
+++ b/libInit.cc Wed Jul 24 10:54:18 2013 +0100
@@ -2,7 +2,7 @@
* $Header$
*
* DO NOT EDIT
- * automagically generated from the projectDefinition: stx_libtool_smallsense.
+ * automagically generated from the projectDefinition: jv_smallsense.
*/
#define __INDIRECTVMINITCALLS__
#include <stc.h>
@@ -13,32 +13,32 @@
#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
DLL_EXPORT void _libjv_smallsense_Init() INIT_TEXT_SECTION;
-// DLL_EXPORT void _libjv_smallsense_InitDefinition() INIT_TEXT_SECTION;
+DLL_EXPORT void _libjv_smallsense_InitDefinition() INIT_TEXT_SECTION;
#endif
-// void _libjv_smallsense_InitDefinition(pass, __pRT__, snd)
-// OBJ snd; struct __vmData__ *__pRT__; {
-// __BEGIN_PACKAGE2__("libjv_smallsense__DFN", _libjv_smallsense_InitDefinition, "stx:libtool/smallsense");
-// _stx_137libtool_137smallsense_Init(pass,__pRT__,snd);
+void _libjv_smallsense_InitDefinition(pass, __pRT__, snd)
+OBJ snd; struct __vmData__ *__pRT__; {
+__BEGIN_PACKAGE2__("libjv_smallsense__DFN", _libjv_smallsense_InitDefinition, "jv:smallsense");
+_jv_137smallsense_Init(pass,__pRT__,snd);
-// __END_PACKAGE__();
-// }
+__END_PACKAGE__();
+}
void _libjv_smallsense_Init(pass, __pRT__, snd)
OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libjv_smallsense", _libjv_smallsense_Init, "stx:libtool/smallsense");
+__BEGIN_PACKAGE2__("libjv_smallsense", _libjv_smallsense_Init, "jv:smallsense");
_SmallSenseChecker_Init(pass,__pRT__,snd);
_SmallSenseCompletionWindow_Init(pass,__pRT__,snd);
_SmallSenseCriticsWindow_Init(pass,__pRT__,snd);
_SmallSenseInfo_Init(pass,__pRT__,snd);
_SmallSenseManager_Init(pass,__pRT__,snd);
+_SmallSensePO_Init(pass,__pRT__,snd);
_SmallSenseParseNodeInspector_Init(pass,__pRT__,snd);
_SmallSenseParseNodeVisitor_Init(pass,__pRT__,snd);
_SmallSenseParser_Init(pass,__pRT__,snd);
_SmallSensePosition_Init(pass,__pRT__,snd);
_SmallSenseQuickFixer_Init(pass,__pRT__,snd);
_SmallSenseRecognizer_Init(pass,__pRT__,snd);
-_SmallSenseResultItem_Init(pass,__pRT__,snd);
_SmallSenseResultSet_Init(pass,__pRT__,snd);
_SmallSenseSelectorNode_Init(pass,__pRT__,snd);
_SmallSenseService_Init(pass,__pRT__,snd);
@@ -50,18 +50,18 @@
_SmallSenseUnacceptedMethodEnvironment_Init(pass,__pRT__,snd);
_jv_137smallsense_Init(pass,__pRT__,snd);
_SmallSenseAbstractInstvarInterfaceExtractor_Init(pass,__pRT__,snd);
-_SmallSenseClass_Init(pass,__pRT__,snd);
_SmallSenseClassInfo_Init(pass,__pRT__,snd);
+_SmallSenseClassPO_Init(pass,__pRT__,snd);
_SmallSenseClassType_Init(pass,__pRT__,snd);
-_SmallSenseConstant_Init(pass,__pRT__,snd);
+_SmallSenseConstantPO_Init(pass,__pRT__,snd);
_SmallSenseFinder_Init(pass,__pRT__,snd);
_SmallSenseInferencer_Init(pass,__pRT__,snd);
-_SmallSenseMethod_Init(pass,__pRT__,snd);
_SmallSenseMethodInfo_Init(pass,__pRT__,snd);
-_SmallSenseSnippet_Init(pass,__pRT__,snd);
+_SmallSenseMethodPO_Init(pass,__pRT__,snd);
+_SmallSenseSnippetPO_Init(pass,__pRT__,snd);
_SmallSenseUnionType_Init(pass,__pRT__,snd);
_SmallSenseUnknownType_Init(pass,__pRT__,snd);
-_SmallSenseVariable_Init(pass,__pRT__,snd);
+_SmallSenseVariablePO_Init(pass,__pRT__,snd);
_SmallSenseInstvarInterfaceExtractor_Init(pass,__pRT__,snd);
_jv_137smallsense_extensions_Init(pass,__pRT__,snd);
--- a/mingwmake.bat Tue Jul 23 20:49:19 2013 +0100
+++ b/mingwmake.bat Wed Jul 24 10:54:18 2013 +0100
@@ -8,7 +8,9 @@
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
-@call ..\..\rules\find_mingw.bat
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+@pushd ..\..\stx\rules
+@call find_mingw.bat
+@popd
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
--- a/smallsense.rc Tue Jul 23 20:49:19 2013 +0100
+++ b/smallsense.rc Wed Jul 24 10:54:18 2013 +0100
@@ -1,6 +1,6 @@
//
// DO NOT EDIT
-// automagically generated from the projectDefinition: stx_libtool_smallsense.
+// automagically generated from the projectDefinition: jv_smallsense.
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 6,2,32767,32767
@@ -21,11 +21,11 @@
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
VALUE "FileVersion", "6.2.32767.32767\0"
- VALUE "InternalName", "stx:libtool/smallsense\0"
+ VALUE "InternalName", "jv:smallsense\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Tue, 26 Feb 2013 12:36:46 GMT\0"
+ VALUE "ProductDate", "Wed, 24 Jul 2013 09:51:19 GMT\0"
END
END
--- a/vcmake.bat Tue Jul 23 20:49:19 2013 +0100
+++ b/vcmake.bat Wed Jul 24 10:54:18 2013 +0100
@@ -5,7 +5,9 @@
@REM -------
@if not defined VSINSTALLDIR (
- call ..\..\rules\vcsetup.bat
+ pushd ..\..\stx\rules
+ call vcsetup.bat
+ popd
)
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make